Commit 728b690f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
  quota: Fix possible deadlock during parallel quotaon and quotaoff
parents ed7ba2ef d01730d7

fs/quota/dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -2042,8 +2042,8 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, 
		 * changes */

		invalidate_bdev(sb->s_bdev);

	}

	mutex_lock(&inode->i_mutex);

	mutex_lock(&dqopt->dqonoff_mutex);

	mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);

	if (sb_has_quota_loaded(sb, type)) {

		error = -EBUSY;

		goto out_lock;
@@ -2094,7 +2094,6 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, 
	dqopt->files[type] = NULL;

	iput(inode);

out_lock:

	mutex_unlock(&dqopt->dqonoff_mutex);

	if (oldflags != -1) {

		down_write(&dqopt->dqptr_sem);

		/* Set the flags back (in the case of accidental quotaon()
@@ -2104,6 +2103,7 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, 
		up_write(&dqopt->dqptr_sem);

	}

	mutex_unlock(&inode->i_mutex);

	mutex_unlock(&dqopt->dqonoff_mutex);

out_fmt:

	put_quota_format(fmt);