diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 12:54:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 12:54:45 -0400 |
commit | 90324cc1b11a211e37eabd8cb863e1a1561d6b1d (patch) | |
tree | c8b79c6850420a114ca6660c1b44fc486b1ba86d /fs/pstore | |
parent | fb8b00675eb6462aacab56bca31ed6107bda5314 (diff) | |
parent | 169ebd90131b2ffca74bb2dbe7eeacd39fb83714 (diff) |
Merge tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback tree from Wu Fengguang:
"Mainly from Jan Kara to avoid iput() in the flusher threads."
* tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Avoid iput() from flusher thread
vfs: Rename end_writeback() to clear_inode()
vfs: Move waiting for inode writeback from end_writeback() to evict_inode()
writeback: Refactor writeback_single_inode()
writeback: Remove wb->list_lock from writeback_single_inode()
writeback: Separate inode requeueing after writeback
writeback: Move I_DIRTY_PAGES handling
writeback: Move requeueing when I_SYNC set to writeback_sb_inodes()
writeback: Move clearing of I_SYNC into inode_sync_complete()
writeback: initialize global_dirty_limit
fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds
mm: page-writeback.c: local functions should not be exposed globally
Diffstat (limited to 'fs/pstore')
-rw-r--r-- | fs/pstore/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 19507889bb7f..aeb19e68e086 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c | |||
@@ -85,7 +85,7 @@ static void pstore_evict_inode(struct inode *inode) | |||
85 | struct pstore_private *p = inode->i_private; | 85 | struct pstore_private *p = inode->i_private; |
86 | unsigned long flags; | 86 | unsigned long flags; |
87 | 87 | ||
88 | end_writeback(inode); | 88 | clear_inode(inode); |
89 | if (p) { | 89 | if (p) { |
90 | spin_lock_irqsave(&allpstore_lock, flags); | 90 | spin_lock_irqsave(&allpstore_lock, flags); |
91 | list_del(&p->list); | 91 | list_del(&p->list); |