Commit ee612d95 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: delete unreachable code in ceph_check_caps() 



"revoking & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)" has already
been tested before calling try_nonblocking_invalidate()

Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent d84b37f9

fs/ceph/caps.c

+3 −12
Original line number Diff line number Diff line
@@ -1793,18 +1793,9 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, 
	    !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);

			}

		}

		tried_invalidate = true;

		goto retry_locked;