ceph: cleanup redundant code in handle_cap_grant

There is no state in local vars that requires us to loop after temporarily
dropping i_lock.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>

1 files changed, 1 insertions, 5 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index e1e6df0f549e..289f6c65a17e 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2210,7 +2210,6 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
         int writeback = 0;
         int revoked_rdcache = 0;
         int queue_invalidate = 0;
-        int tried_invalidate = 0;
 
         dout("handle_cap_grant inode %p cap %p mds%d seq %d %s\n",
              inode, cap, mds, seq, ceph_cap_string(newcaps));
@@ -2222,10 +2221,8 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
          * try to invalidate (once).  (If there are dirty buffers, we
          * will invalidate _after_ writeback.)
          */
-restart:
         if (((cap->issued & ~newcaps) & CEPH_CAP_FILE_CACHE) &&
-            !ci->i_wrbuffer_ref && !tried_invalidate) {
-                tried_invalidate = 1;
+            !ci->i_wrbuffer_ref) {
                 if (try_nonblocking_invalidate(inode) == 0) {
                         revoked_rdcache = 1;
                 } else {
@@ -2236,7 +2233,6 @@ restart:
                                 ci->i_rdcache_revoking = ci->i_rdcache_gen;
                         }
                 }
-                goto restart;
         }
 
         /* side effects now are allowed */