diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /fs/ext3/inode.c | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'fs/ext3/inode.c')
| -rw-r--r-- | fs/ext3/inode.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 9a4a5c48b1c9..a07597307fd1 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -3459,14 +3459,6 @@ ext3_reserve_inode_write(handle_t *handle, struct inode *inode, | |||
| 3459 | * inode out, but prune_icache isn't a user-visible syncing function. | 3459 | * inode out, but prune_icache isn't a user-visible syncing function. |
| 3460 | * Whenever the user wants stuff synced (sys_sync, sys_msync, sys_fsync) | 3460 | * Whenever the user wants stuff synced (sys_sync, sys_msync, sys_fsync) |
| 3461 | * we start and wait on commits. | 3461 | * we start and wait on commits. |
| 3462 | * | ||
| 3463 | * Is this efficient/effective? Well, we're being nice to the system | ||
| 3464 | * by cleaning up our inodes proactively so they can be reaped | ||
| 3465 | * without I/O. But we are potentially leaving up to five seconds' | ||
| 3466 | * worth of inodes floating about which prune_icache wants us to | ||
| 3467 | * write out. One way to fix that would be to get prune_icache() | ||
| 3468 | * to do a write_super() to free up some memory. It has the desired | ||
| 3469 | * effect. | ||
| 3470 | */ | 3462 | */ |
| 3471 | int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode) | 3463 | int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode) |
| 3472 | { | 3464 | { |