Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 601c5c2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.14-rc7' of git://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "A small lock imbalance fix, marked for stable"

* tag 'ceph-for-4.14-rc7' of git://github.com/ceph/ceph-client:
  ceph: unlock dangling spinlock in try_flush_caps()
parents 4ed59027 6c2838fb

fs/ceph/caps.c

+4 −1
Original line number Diff line number Diff line
@@ -1991,6 +1991,7 @@ static int try_flush_caps(struct inode *inode, u64 *ptid) 
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;

	}
@@ -2008,8 +2009,10 @@ static int try_flush_caps(struct inode *inode, u64 *ptid) 
			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, true,

						&flush_tid, &oldest_flush_tid);