Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 70727
b: refs/heads/master
c: 1b43ef9
h: refs/heads/master
i:
  70725: 0b19c02
  70723: 3cd741f
  70719: b8bfced
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Oct 17, 2007
1 parent 9a613d5 commit 170ee72
Show file tree
Hide file tree
Showing 2 changed files with 12 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: c986d1e2a460cbce79d631c51519ae82c778c6c5
refs/heads/master: 1b43ef91d40190b16ba10218e66d5c2c4ba11de3
15 changes: 11 additions & 4 deletions trunk/fs/fs-writeback.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
{
unsigned dirty;
struct address_space *mapping = inode->i_mapping;
struct super_block *sb = inode->i_sb;
int wait = wbc->sync_mode == WB_SYNC_ALL;
int ret;

Expand Down Expand Up @@ -237,7 +236,16 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
/*
* We didn't write back all the pages. nfs_writepages()
* sometimes bales out without doing anything. Redirty
* the inode. It is still on sb->s_io.
* the inode. It is moved from s_io onto s_dirty.
*/
/*
* akpm: if the caller was the kupdate function we put
* this inode at the head of s_dirty so it gets first
* consideration. Otherwise, move it to the tail, for
* the reasons described there. I'm not really sure
* how much sense this makes. Presumably I had a good
* reasons for doing it this way, and I'd rather not
* muck with it at present.
*/
if (wbc->for_kupdate) {
/*
Expand All @@ -257,8 +265,7 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
* all the other files.
*/
inode->i_state |= I_DIRTY_PAGES;
inode->dirtied_when = jiffies;
list_move(&inode->i_list, &sb->s_dirty);
redirty_tail(inode);
}
} else if (inode->i_state & I_DIRTY) {
/*
Expand Down

0 comments on commit 170ee72

Please sign in to comment.