| Message ID | 1376553278-8153-1-git-send-email-liwang@ubuntukylin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied to testing branch, Thanks! sage On Thu, 15 Aug 2013, Li Wang wrote: > Cleanup in handle_cap_grant() > > Signed-off-by: Li Wang <liwang@ubuntukylin.com> > --- > fs/ceph/caps.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c > index 25442b4..8c90cae 100644 > --- a/fs/ceph/caps.c > +++ b/fs/ceph/caps.c > @@ -2361,7 +2361,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; > > dout("handle_cap_grant inode %p cap %p mds%d seq %d %s\n", > @@ -2377,9 +2376,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) { > -- > 1.7.9.5 > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 25442b4..8c90cae 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -2361,7 +2361,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; dout("handle_cap_grant inode %p cap %p mds%d seq %d %s\n", @@ -2377,9 +2376,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) {
Cleanup in handle_cap_grant() Signed-off-by: Li Wang <liwang@ubuntukylin.com> --- fs/ceph/caps.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)