From 1d0c2dde8ef659e18c50967821f5d630420564be Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 3 Jul 2006 00:25:20 -0700 Subject: [PATCH] --- yaml --- r: 31831 b: refs/heads/master c: 5c81a4197de38411fe3e27f8593fff73a5d6b868 h: refs/heads/master i: 31829: 86f775c1dad11f04e6823e0298ca7443cab03c1e 31827: c8c4c084be4033a28dbebfc8603aedce24023e1e 31823: b86668ece16df4bdc2342c5c93257c97454aa7c4 v: v3 --- [refs] | 2 +- trunk/fs/ext2/super.c | 2 +- trunk/fs/ext3/super.c | 2 +- trunk/fs/reiserfs/super.c | 2 +- trunk/fs/ufs/super.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c4faea66cfa2..03953053a3dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59345374742ee6673c2d04b0fa8c888e881b7209 +refs/heads/master: 5c81a4197de38411fe3e27f8593fff73a5d6b868 diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c index 9f43879d6d68..f2702cda9779 100644 --- a/trunk/fs/ext2/super.c +++ b/trunk/fs/ext2/super.c @@ -1157,7 +1157,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type, struct buffer_head tmp_bh; struct buffer_head *bh; - mutex_lock(&inode->i_mutex); + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); while (towrite > 0) { tocopy = sb->s_blocksize - offset < towrite ? sb->s_blocksize - offset : towrite; diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index f2dd71336612..813d589cc6c0 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -2614,7 +2614,7 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, struct buffer_head *bh; handle_t *handle = journal_current_handle(); - mutex_lock(&inode->i_mutex); + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); while (towrite > 0) { tocopy = sb->s_blocksize - offset < towrite ? sb->s_blocksize - offset : towrite; diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c index 28eb3c886034..5567328f1041 100644 --- a/trunk/fs/reiserfs/super.c +++ b/trunk/fs/reiserfs/super.c @@ -2203,7 +2203,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, size_t towrite = len; struct buffer_head tmp_bh, *bh; - mutex_lock(&inode->i_mutex); + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); while (towrite > 0) { tocopy = sb->s_blocksize - offset < towrite ? sb->s_blocksize - offset : towrite; diff --git a/trunk/fs/ufs/super.c b/trunk/fs/ufs/super.c index 19a99726e58d..992ee0b87cc3 100644 --- a/trunk/fs/ufs/super.c +++ b/trunk/fs/ufs/super.c @@ -1326,7 +1326,7 @@ static ssize_t ufs_quota_write(struct super_block *sb, int type, size_t towrite = len; struct buffer_head *bh; - mutex_lock(&inode->i_mutex); + mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA); while (towrite > 0) { tocopy = sb->s_blocksize - offset < towrite ? sb->s_blocksize - offset : towrite;