summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-04-25 21:29:42 +0200
committerJan Kara <jack@suse.cz>2012-05-15 23:34:38 +0200
commite2a3fde75079efeb22cf1e5098d5689b664bf1d5 (patch)
tree2e48dcc173ac5b6c5da67d97f50b88391f5d0efe /fs/ext2
parent67f1648d217c3b8165ca114c7838164f31e15790 (diff)
downloadblackbird-op-linux-e2a3fde75079efeb22cf1e5098d5689b664bf1d5.tar.gz
blackbird-op-linux-e2a3fde75079efeb22cf1e5098d5689b664bf1d5.zip
ext2: Remove i_mutex use from ext2_quota_write()
We don't need i_mutex in ext2_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/ext2')
-rw-r--r--fs/ext2/super.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index e0e8f45e9a71..7c1207c0e0c1 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1434,7 +1434,6 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
struct buffer_head tmp_bh;
struct buffer_head *bh;
- mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
while (towrite > 0) {
tocopy = sb->s_blocksize - offset < towrite ?
sb->s_blocksize - offset : towrite;
@@ -1464,16 +1463,13 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
blk++;
}
out:
- if (len == towrite) {
- mutex_unlock(&inode->i_mutex);
+ if (len == towrite)
return err;
- }
if (inode->i_size < off+len-towrite)
i_size_write(inode, off+len-towrite);
inode->i_version++;
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
mark_inode_dirty(inode);
- mutex_unlock(&inode->i_mutex);
return len - towrite;
}
OpenPOWER on IntegriCloud