diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 10:07:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 10:07:27 -0700 |
commit | 529b73fc0a9764050dcc597f4851728e8ff59165 (patch) | |
tree | d22dc4bf4d7523ea1c41790f8e52805b4ea75f19 | |
parent | 69e1aaddd63104f37021d0b0f6abfd9623c9134c (diff) | |
parent | 697e6fed9fc620eb6c79ebcfe6865b66773c0221 (diff) | |
download | linux-529b73fc0a9764050dcc597f4851728e8ff59165.tar.gz linux-529b73fc0a9764050dcc597f4851728e8ff59165.tar.bz2 linux-529b73fc0a9764050dcc597f4851728e8ff59165.zip |
Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull trivial writeback fixes from Wu Fengguang:
"They've been tested in linux-next for 20 days actually."
* tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Remove outdated comment
fs: Remove bogus wait in write_inode_now()
-rw-r--r-- | fs/fs-writeback.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 236972b752f5..539f36cf3e4a 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -256,7 +256,8 @@ static bool inode_dirtied_after(struct inode *inode, unsigned long t) } /* - * Move expired dirty inodes from @delaying_queue to @dispatch_queue. + * Move expired (dirtied after work->older_than_this) dirty inodes from + * @delaying_queue to @dispatch_queue. */ static int move_expired_inodes(struct list_head *delaying_queue, struct list_head *dispatch_queue, @@ -1148,23 +1149,6 @@ out_unlock_inode: } EXPORT_SYMBOL(__mark_inode_dirty); -/* - * Write out a superblock's list of dirty inodes. A wait will be performed - * upon no inodes, all inodes or the final one, depending upon sync_mode. - * - * If older_than_this is non-NULL, then only write out inodes which - * had their first dirtying at a time earlier than *older_than_this. - * - * If `bdi' is non-zero then we're being asked to writeback a specific queue. - * This function assumes that the blockdev superblock's inodes are backed by - * a variety of queues, so all inodes are searched. For other superblocks, - * assume that all inodes are backed by the same queue. - * - * The inodes to be written are parked on bdi->b_io. They are moved back onto - * bdi->b_dirty as they are selected for writing. This way, none can be missed - * on the writer throttling path, and we get decent balancing between many - * throttled threads: we don't want them all piling up on inode_sync_wait. - */ static void wait_sb_inodes(struct super_block *sb) { struct inode *inode, *old_inode = NULL; @@ -1364,8 +1348,6 @@ int write_inode_now(struct inode *inode, int sync) ret = writeback_single_inode(inode, wb, &wbc); spin_unlock(&inode->i_lock); spin_unlock(&wb->list_lock); - if (sync) - inode_sync_wait(inode); return ret; } EXPORT_SYMBOL(write_inode_now); |