ceph: delete unreachable code in ceph_check_caps()
authorYan, Zheng <zyan@redhat.com>
Mon, 8 Jan 2018 06:36:25 +0000 (14:36 +0800)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 29 Jan 2018 17:36:11 +0000 (18:36 +0100)
"revoking & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)" has already
been tested before calling try_nonblocking_invalidate()

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
fs/ceph/caps.c

index f28efae..36f8a4b 100644 (file)
@@ -1793,18 +1793,9 @@ retry_locked:
            !tried_invalidate) {
                dout("check_caps trying to invalidate on %p\n", inode);
                if (try_nonblocking_invalidate(inode) < 0) {
-                       if (revoking & (CEPH_CAP_FILE_CACHE|
-                                       CEPH_CAP_FILE_LAZYIO)) {
-                               dout("check_caps queuing invalidate\n");
-                               queue_invalidate = true;
-                               ci->i_rdcache_revoking = ci->i_rdcache_gen;
-                       } else {
-                               dout("check_caps failed to invalidate pages\n");
-                               /* we failed to invalidate pages.  check these
-                                  caps again later. */
-                               force_requeue = true;
-                               __cap_set_timeouts(mdsc, ci);
-                       }
+                       dout("check_caps queuing invalidate\n");
+                       queue_invalidate = true;
+                       ci->i_rdcache_revoking = ci->i_rdcache_gen;
                }
                tried_invalidate = true;
                goto retry_locked;