diff options
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 7c45acf94589..56bf76586019 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -2150,7 +2150,7 @@ int ext3_force_commit(struct super_block *sb) | |||
2150 | 2150 | ||
2151 | static void ext3_write_super (struct super_block * sb) | 2151 | static void ext3_write_super (struct super_block * sb) |
2152 | { | 2152 | { |
2153 | if (down_trylock(&sb->s_lock) == 0) | 2153 | if (mutex_trylock(&sb->s_lock) != 0) |
2154 | BUG(); | 2154 | BUG(); |
2155 | sb->s_dirt = 0; | 2155 | sb->s_dirt = 0; |
2156 | } | 2156 | } |
@@ -2601,7 +2601,7 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
2601 | struct buffer_head *bh; | 2601 | struct buffer_head *bh; |
2602 | handle_t *handle = journal_current_handle(); | 2602 | handle_t *handle = journal_current_handle(); |
2603 | 2603 | ||
2604 | down(&inode->i_sem); | 2604 | mutex_lock(&inode->i_mutex); |
2605 | while (towrite > 0) { | 2605 | while (towrite > 0) { |
2606 | tocopy = sb->s_blocksize - offset < towrite ? | 2606 | tocopy = sb->s_blocksize - offset < towrite ? |
2607 | sb->s_blocksize - offset : towrite; | 2607 | sb->s_blocksize - offset : towrite; |
@@ -2644,7 +2644,7 @@ out: | |||
2644 | inode->i_version++; | 2644 | inode->i_version++; |
2645 | inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 2645 | inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
2646 | ext3_mark_inode_dirty(handle, inode); | 2646 | ext3_mark_inode_dirty(handle, inode); |
2647 | up(&inode->i_sem); | 2647 | mutex_unlock(&inode->i_mutex); |
2648 | return len - towrite; | 2648 | return len - towrite; |
2649 | } | 2649 | } |
2650 | 2650 | ||