Commit 55d4aa12 authored Oct 19, 2017 by Jeff Layton Committed by Greg Kroah-Hartman Nov 02, 2017

ceph: unlock dangling spinlock in try_flush_caps()



commit 6c2838fbdedb9b72a81c931d49e56b229b6cdbca upstream.

sparse warns:

  fs/ceph/caps.c:2042:9: warning: context imbalance in 'try_flush_caps' - wrong count at exit

We need to exit this function with the lock unlocked, but a couple of
cases leave it locked.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b44ef85f

fs/ceph/caps.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1748,6 +1748,7 @@ static int try_flush_caps(struct inode inode, unsigned flush_tid)
		retry:
		spin_lock(&ci->i_ceph_lock);
		if (ci->i_ceph_flags & CEPH_I_NOFLUSH) {
		spin_unlock(&ci->i_ceph_lock);
		dout("try_flush_caps skipping %p I_NOFLUSH set\n", inode);
		goto out;
		}
		@@ -1765,8 +1766,10 @@ retry:
		mutex_lock(&session->s_mutex);
		goto retry;
		}
		if (cap->session->s_state < CEPH_MDS_SESSION_OPEN)
		if (cap->session->s_state < CEPH_MDS_SESSION_OPEN) {
		spin_unlock(&ci->i_ceph_lock);
		goto out;
		}

		flushing = __mark_caps_flushing(inode, session);