summaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-04-25 21:24:30 +0200
committerJan Kara <jack@suse.cz>2012-05-15 23:34:37 +0200
commit905c3937625d14fa4453a2643814b72b8a22d9ae (patch)
tree5eb2a865b1a64c9b15d3e169bf20aac1f77a3373 /fs/ext3
parentquota: Fix double lock in add_dquot_ref() with CONFIG_QUOTA_DEBUG (diff)
downloadlinux-905c3937625d14fa4453a2643814b72b8a22d9ae.tar.xz
linux-905c3937625d14fa4453a2643814b72b8a22d9ae.zip
ext3: Remove i_mutex use from ext3_quota_write()
We don't need i_mutex in ext3_quota_write() because writes to quota file are serialized by dqio_mutex anyway. Changes to quota files outside of quota code are forbidded and enforced by NOATIME and IMMUTABLE bits. Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index cf0b5921cf0f..7c08c93bb615 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -3000,7 +3000,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
(unsigned long long)off, (unsigned long long)len);
return -EIO;
}
- mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
bh = ext3_bread(handle, inode, blk, 1, &err);
if (!bh)
goto out;
@@ -3024,10 +3023,8 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
}
brelse(bh);
out:
- if (err) {
- mutex_unlock(&inode->i_mutex);
+ if (err)
return err;
- }
if (inode->i_size < off + len) {
i_size_write(inode, off + len);
EXT3_I(inode)->i_disksize = inode->i_size;
@@ -3035,7 +3032,6 @@ out:
inode->i_version++;
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
ext3_mark_inode_dirty(handle, inode);
- mutex_unlock(&inode->i_mutex);
return len;
}