From: Li Wang <liwang@ubuntukylin.com>
Date: Fri, 16 Aug 2013 05:00:25 +0000 (-0700)
Subject: ceph: remove useless variable revoked_rdcache
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e90757432361bb8b3ad3c3fd866324ed47875693;p=linux-beck.git

ceph: remove useless variable revoked_rdcache

Cleanup in handle_cap_grant().

Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 165ebbeab1c3..5a26bc1dd799 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2393,7 +2393,6 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 	int check_caps = 0;
 	int wake = 0;
 	int writeback = 0;
-	int revoked_rdcache = 0;
 	int queue_invalidate = 0;
 	int deleted_inode = 0;
 
@@ -2410,9 +2409,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 	if (((cap->issued & ~newcaps) & CEPH_CAP_FILE_CACHE) &&
 	    (newcaps & CEPH_CAP_FILE_LAZYIO) == 0 &&
 	    !ci->i_wrbuffer_ref) {
-		if (try_nonblocking_invalidate(inode) == 0) {
-			revoked_rdcache = 1;
-		} else {
+		if (try_nonblocking_invalidate(inode)) {
 			/* there were locked pages.. invalidate later
 			   in a separate thread. */
 			if (ci->i_rdcache_revoking != ci->i_rdcache_gen) {