Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332467
b: refs/heads/master
c: cd8ed2a
h: refs/heads/master
i:
  332465: 4d80128
  332463: f021cc1
v: v3
  • Loading branch information
Yan Hong authored and Linus Torvalds committed Oct 9, 2012
1 parent 797a1a6 commit b038238
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c462f179e4d273f0da0e7cf302e29b0edf43844e
refs/heads/master: cd8ed2a45a401cb692d769e92de7d73aa42fabce
7 changes: 3 additions & 4 deletions trunk/fs/fs-writeback.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,
* setting I_SYNC flag and calling inode_sync_complete() to clear it.
*/
static int
__writeback_single_inode(struct inode *inode, struct bdi_writeback *wb,
struct writeback_control *wbc)
__writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
{
struct address_space *mapping = inode->i_mapping;
long nr_to_write = wbc->nr_to_write;
Expand Down Expand Up @@ -527,7 +526,7 @@ writeback_single_inode(struct inode *inode, struct bdi_writeback *wb,
inode->i_state |= I_SYNC;
spin_unlock(&inode->i_lock);

ret = __writeback_single_inode(inode, wb, wbc);
ret = __writeback_single_inode(inode, wbc);

spin_lock(&wb->list_lock);
spin_lock(&inode->i_lock);
Expand Down Expand Up @@ -670,7 +669,7 @@ static long writeback_sb_inodes(struct super_block *sb,
* We use I_SYNC to pin the inode in memory. While it is set
* evict_inode() will wait so the inode cannot be freed.
*/
__writeback_single_inode(inode, wb, &wbc);
__writeback_single_inode(inode, &wbc);

work->nr_pages -= write_chunk - wbc.nr_to_write;
wrote += write_chunk - wbc.nr_to_write;
Expand Down

0 comments on commit b038238

Please sign in to comment.