Commit 58dd4385 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: don't leak snap_rwsem in handle_cap_grant 

When handle_cap_grant is called on an IMPORT op, then the snap_rwsem is
held and the function is expected to release it before returning. It
currently fails to do that in all cases which could lead to a deadlock.

Fixes: 6f05b30e ("ceph: reset i_requested_max_size if file write is not wanted")
Link: https://tracker.ceph.com/issues/55857


Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarLuís Henriques <lhenriques@suse.de>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent d93231a6

fs/ceph/caps.c

+13 −14
Original line number Diff line number Diff line
@@ -3578,8 +3578,8 @@ static void handle_cap_grant(struct inode *inode, 
			fill_inline = true;

	}



	if (ci->i_auth_cap == cap &&

	    le32_to_cpu(grant->op) == CEPH_CAP_OP_IMPORT) {

	if (le32_to_cpu(grant->op) == CEPH_CAP_OP_IMPORT) {

		if (ci->i_auth_cap == cap) {

			if (newcaps & ~extra_info->issued)

				wake = true;
@@ -3591,11 +3591,10 @@ static void handle_cap_grant(struct inode *inode, 
			}



			ceph_kick_flushing_inode_caps(session, ci);

		spin_unlock(&ci->i_ceph_lock);

		}

		up_read(&session->s_mdsc->snap_rwsem);

	} else {

		spin_unlock(&ci->i_ceph_lock);

	}

	spin_unlock(&ci->i_ceph_lock);



	if (fill_inline)

		ceph_fill_inline_data(inode, NULL, extra_info->inline_data,