diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /fs/super.c | |
| parent | 140573d33b703194b7e1893711e78b7f546cca7c (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into sched/core
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c index 645e5403f2a0..61dce001dd57 100644 --- a/fs/super.c +++ b/fs/super.c | |||
| @@ -301,7 +301,7 @@ void generic_shutdown_super(struct super_block *sb) | |||
| 301 | /* | 301 | /* |
| 302 | * wait for asynchronous fs operations to finish before going further | 302 | * wait for asynchronous fs operations to finish before going further |
| 303 | */ | 303 | */ |
| 304 | async_synchronize_full_special(&sb->s_async_list); | 304 | async_synchronize_full_domain(&sb->s_async_list); |
| 305 | 305 | ||
| 306 | /* bad name - it should be evict_inodes() */ | 306 | /* bad name - it should be evict_inodes() */ |
| 307 | invalidate_inodes(sb); | 307 | invalidate_inodes(sb); |
| @@ -470,7 +470,7 @@ restart: | |||
| 470 | sb->s_count++; | 470 | sb->s_count++; |
| 471 | spin_unlock(&sb_lock); | 471 | spin_unlock(&sb_lock); |
| 472 | down_read(&sb->s_umount); | 472 | down_read(&sb->s_umount); |
| 473 | async_synchronize_full_special(&sb->s_async_list); | 473 | async_synchronize_full_domain(&sb->s_async_list); |
| 474 | if (sb->s_root && (wait || sb->s_dirt)) | 474 | if (sb->s_root && (wait || sb->s_dirt)) |
| 475 | sb->s_op->sync_fs(sb, wait); | 475 | sb->s_op->sync_fs(sb, wait); |
| 476 | up_read(&sb->s_umount); | 476 | up_read(&sb->s_umount); |