diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /fs/ext2/super.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/ext2/super.c')
| -rw-r--r-- | fs/ext2/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 522fa70dd8ea..8d6819846fc9 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -1152,7 +1152,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type, | |||
| 1152 | struct buffer_head tmp_bh; | 1152 | struct buffer_head tmp_bh; |
| 1153 | struct buffer_head *bh; | 1153 | struct buffer_head *bh; |
| 1154 | 1154 | ||
| 1155 | down(&inode->i_sem); | 1155 | mutex_lock(&inode->i_mutex); |
| 1156 | while (towrite > 0) { | 1156 | while (towrite > 0) { |
| 1157 | tocopy = sb->s_blocksize - offset < towrite ? | 1157 | tocopy = sb->s_blocksize - offset < towrite ? |
| 1158 | sb->s_blocksize - offset : towrite; | 1158 | sb->s_blocksize - offset : towrite; |
| @@ -1189,7 +1189,7 @@ out: | |||
| 1189 | inode->i_version++; | 1189 | inode->i_version++; |
| 1190 | inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 1190 | inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 1191 | mark_inode_dirty(inode); | 1191 | mark_inode_dirty(inode); |
| 1192 | up(&inode->i_sem); | 1192 | mutex_unlock(&inode->i_mutex); |
| 1193 | return len - towrite; | 1193 | return len - towrite; |
| 1194 | } | 1194 | } |
| 1195 | 1195 | ||
