From: Andrew Morton <akpm@osdl.org>
Date: Mon, 29 Dec 2003 13:51:19 +0000 (-0800)
Subject: [PATCH] Ext3+quota deadlock fix
X-Git-Tag: v2.6.1-rc1~22^2~38
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=db84a8205be93ec4f643f8df90f991336ee5f257;p=history.git

[PATCH] Ext3+quota deadlock fix

From: Jan Kara <jack@ucw.cz>

here's patch which should fix deadlock with quotas+ext3 reported in 2.4
(the same problem existed in 2.6 but nobody found it).
---

diff --git a/fs/dquot.c b/fs/dquot.c
index 2e4d1f9e3fe6..b2108080c841 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -344,7 +344,7 @@ restart:
 		atomic_inc(&dquot->dq_count);
 		dqstats.lookups++;
 		spin_unlock(&dq_list_lock);
-		sb->dq_op->sync_dquot(dquot);
+		sb->dq_op->write_dquot(dquot);
 		dqput(dquot);
 		goto restart;
 	}
@@ -432,7 +432,7 @@ we_slept:
 	}
 	if (dquot_dirty(dquot)) {
 		spin_unlock(&dq_list_lock);
-		commit_dqblk(dquot);
+		dquot->dq_sb->dq_op->write_dquot(dquot);
 		goto we_slept;
 	}
 	atomic_dec(&dquot->dq_count);
@@ -1088,7 +1088,7 @@ struct dquot_operations dquot_operations = {
 	.free_space	= dquot_free_space,
 	.free_inode	= dquot_free_inode,
 	.transfer	= dquot_transfer,
-	.sync_dquot	= commit_dqblk
+	.write_dquot	= commit_dqblk
 };
 
 /* Function used by filesystems for initializing the dquot_operations structure */
@@ -1212,9 +1212,9 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
 	error = -EINVAL;
 	if (!fmt->qf_ops->check_quota_file(sb, type))
 		goto out_file_init;
-	/* We don't want quota on quota files */
+	/* We don't want quota and atime on quota files (deadlocks possible) */
 	dquot_drop_nolock(inode);
-	inode->i_flags |= S_NOQUOTA;
+	inode->i_flags |= S_NOQUOTA | S_NOATIME;
 
 	dqopt->ops[type] = fmt->qf_ops;
 	dqopt->info[type].dqi_format = fmt;
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d92187197f68..e2b4a68ccd1a 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1952,9 +1952,9 @@ int ext3_statfs (struct super_block * sb, struct kstatfs * buf)
 /* Blocks: quota info + (4 pointer blocks + 1 entry block) * (3 indirect + 1 descriptor + 1 bitmap) + superblock */
 #define EXT3_V0_QFMT_BLOCKS 27
 
-static int (*old_sync_dquot)(struct dquot *dquot);
+static int (*old_write_dquot)(struct dquot *dquot);
 
-static int ext3_sync_dquot(struct dquot *dquot)
+static int ext3_write_dquot(struct dquot *dquot)
 {
 	int nblocks;
 	int ret;
@@ -1979,7 +1979,7 @@ static int ext3_sync_dquot(struct dquot *dquot)
 		ret = PTR_ERR(handle);
 		goto out;
 	}
-	ret = old_sync_dquot(dquot);
+	ret = old_write_dquot(dquot);
 	err = ext3_journal_stop(handle);
 	if (ret == 0)
 		ret = err;
@@ -2012,8 +2012,8 @@ static int __init init_ext3_fs(void)
 		goto out1;
 #ifdef CONFIG_QUOTA
 	init_dquot_operations(&ext3_qops);
-	old_sync_dquot = ext3_qops.sync_dquot;
-	ext3_qops.sync_dquot = ext3_sync_dquot;
+	old_write_dquot = ext3_qops.write_dquot;
+	ext3_qops.write_dquot = ext3_write_dquot;
 #endif
         err = register_filesystem(&ext3_fs_type);
 	if (err)
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 447b5e192a74..2f65eb567384 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -250,7 +250,7 @@ struct dquot_operations {
 	void (*free_space) (struct inode *, qsize_t);
 	void (*free_inode) (const struct inode *, unsigned long);
 	int (*transfer) (struct inode *, struct iattr *);
-	int (*sync_dquot) (struct dquot *);
+	int (*write_dquot) (struct dquot *);
 };
 
 /* Operations handling requests from userspace */