[lkml]   [2011]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[44/53] xfs: fix xfs_mark_inode_dirty during umount
3.0-stable review patch.  If anyone has any objections, please let me know.


From: Christoph Hellwig <>

commit 866e4ed77448a0c311e1b055eb72ea05423fd799 upstream.

During umount we do not add a dirty inode to the lru and wait for it to
become clean first, but force writeback of data and metadata with
I_WILL_FREE set. Currently there is no way for XFS to detect that the
inode has been redirtied for metadata operations, as we skip the
mark_inode_dirty call during teardown. Fix this by setting i_update_core
nanually in that case, so that the inode gets flushed during inode reclaim.

Alternatively we could enable calling mark_inode_dirty for inodes in
I_WILL_FREE state, and let the VFS dirty tracking handle this. I decided
against this as we will get better I/O patterns from reclaim compared to
the synchronous writeout in write_inode_now, and always marking the inode
dirty in some way from xfs_mark_inode_dirty is a better safetly net in
either case.

Signed-off-by: Christoph Hellwig <>
Reviewed-by: Dave Chinner <>
Signed-off-by: Alex Elder <>
Signed-off-by: Greg Kroah-Hartman <>
fs/xfs/linux-2.6/xfs_iops.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -69,9 +69,8 @@ xfs_synchronize_times(

- * If the linux inode is valid, mark it dirty.
- * Used when committing a dirty inode into a transaction so that
- * the inode will get written back by the linux code
+ * If the linux inode is valid, mark it dirty, else mark the dirty state
+ * in the XFS inode to make sure we pick it up when reclaiming the inode.
@@ -81,6 +80,10 @@ xfs_mark_inode_dirty_sync(

if (!(inode->i_state & (I_WILL_FREE|I_FREEING)))
+ else {
+ barrier();
+ ip->i_update_core = 1;
+ }

@@ -91,6 +94,11 @@ xfs_mark_inode_dirty(

if (!(inode->i_state & (I_WILL_FREE|I_FREEING)))
+ else {
+ barrier();
+ ip->i_update_core = 1;
+ }


 \ /
  Last update: 2011-11-23 02:07    [W:1.371 / U:0.012 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site