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

Commit 52a9ee28 authored by Jan Kara's avatar Jan Kara
Browse files

ocfs2: Use __dquot_transfer to avoid lock inversion 



dquot_transfer() acquires own references to dquots via dqget(). Thus it waits
for dq_lock which creates a lock inversion because dq_lock ranks above
transaction start but transaction is already started in ocfs2_setattr(). Fix
the problem by passing own references directly to __dquot_transfer.

Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 741e1289

fs/ocfs2/file.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -933,9 +933,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
	struct ocfs2_super *osb = OCFS2_SB(sb);

	struct ocfs2_super *osb = OCFS2_SB(sb);

	struct buffer_head *bh = NULL;

	struct buffer_head *bh = NULL;

	handle_t *handle = NULL;

	handle_t *handle = NULL;

	int qtype;

	struct dquot *transfer_from[MAXQUOTAS] = { };

	struct dquot *transfer_to[MAXQUOTAS] = { };

	struct dquot *transfer_to[MAXQUOTAS] = { };

	int qtype;





	mlog_entry("(0x%p, '%.*s')\n", dentry,

	mlog_entry("(0x%p, '%.*s')\n", dentry,

	           dentry->d_name.len, dentry->d_name.name);

	           dentry->d_name.len, dentry->d_name.name);
@@ -1019,9 +1018,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
		    OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {

		    OCFS2_FEATURE_RO_COMPAT_USRQUOTA)) {

			transfer_to[USRQUOTA] = dqget(sb, attr->ia_uid,

			transfer_to[USRQUOTA] = dqget(sb, attr->ia_uid,

						      USRQUOTA);

						      USRQUOTA);

			transfer_from[USRQUOTA] = dqget(sb, inode->i_uid,

			if (!transfer_to[USRQUOTA]) {

							USRQUOTA);

			if (!transfer_to[USRQUOTA] || !transfer_from[USRQUOTA]) {

				status = -ESRCH;

				status = -ESRCH;

				goto bail_unlock;

				goto bail_unlock;

			}

			}
@@ -1031,9 +1028,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
		    OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)) {

		    OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)) {

			transfer_to[GRPQUOTA] = dqget(sb, attr->ia_gid,

			transfer_to[GRPQUOTA] = dqget(sb, attr->ia_gid,

						      GRPQUOTA);

						      GRPQUOTA);

			transfer_from[GRPQUOTA] = dqget(sb, inode->i_gid,

			if (!transfer_to[GRPQUOTA]) {

							GRPQUOTA);

			if (!transfer_to[GRPQUOTA] || !transfer_from[GRPQUOTA]) {

				status = -ESRCH;

				status = -ESRCH;

				goto bail_unlock;

				goto bail_unlock;

			}

			}
@@ -1045,7 +1040,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
			mlog_errno(status);

			mlog_errno(status);

			goto bail_unlock;

			goto bail_unlock;

		}

		}

		status = dquot_transfer(inode, attr);

		status = __dquot_transfer(inode, transfer_to);

		if (status < 0)

		if (status < 0)

			goto bail_commit;

			goto bail_commit;

	} else {

	} else {
@@ -1085,10 +1080,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
	brelse(bh);

	brelse(bh);





	/* Release quota pointers in case we acquired them */

	/* Release quota pointers in case we acquired them */

	for (qtype = 0; qtype < MAXQUOTAS; qtype++) {

	for (qtype = 0; qtype < MAXQUOTAS; qtype++)

		dqput(transfer_to[qtype]);

		dqput(transfer_to[qtype]);

		dqput(transfer_from[qtype]);

	}





	if (!status && attr->ia_valid & ATTR_MODE) {

	if (!status && attr->ia_valid & ATTR_MODE) {

		status = ocfs2_acl_chmod(inode);

		status = ocfs2_acl_chmod(inode);