diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /fs/ext3/ialloc.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'fs/ext3/ialloc.c')
| -rw-r--r-- | fs/ext3/ialloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index dd13d60d524b..b39991285136 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
| @@ -181,7 +181,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode) | |||
| 181 | err = ext3_journal_dirty_metadata(handle, bitmap_bh); | 181 | err = ext3_journal_dirty_metadata(handle, bitmap_bh); |
| 182 | if (!fatal) | 182 | if (!fatal) |
| 183 | fatal = err; | 183 | fatal = err; |
| 184 | sb->s_dirt = 1; | 184 | |
| 185 | error_return: | 185 | error_return: |
| 186 | brelse(bitmap_bh); | 186 | brelse(bitmap_bh); |
| 187 | ext3_std_error(sb, fatal); | 187 | ext3_std_error(sb, fatal); |
| @@ -537,7 +537,6 @@ got: | |||
| 537 | percpu_counter_dec(&sbi->s_freeinodes_counter); | 537 | percpu_counter_dec(&sbi->s_freeinodes_counter); |
| 538 | if (S_ISDIR(mode)) | 538 | if (S_ISDIR(mode)) |
| 539 | percpu_counter_inc(&sbi->s_dirs_counter); | 539 | percpu_counter_inc(&sbi->s_dirs_counter); |
| 540 | sb->s_dirt = 1; | ||
| 541 | 540 | ||
| 542 | inode->i_uid = current_fsuid(); | 541 | inode->i_uid = current_fsuid(); |
| 543 | if (test_opt (sb, GRPID)) | 542 | if (test_opt (sb, GRPID)) |