diff options
author | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /fs/inode.c | |
parent | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (diff) | |
parent | 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca (diff) |
Merge branch 'acpica' into release
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 9c2b795ccc9..0647d80accf 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -548,11 +548,14 @@ void evict_inodes(struct super_block *sb) /** * invalidate_inodes - attempt to free all inodes on a superblock * @sb: superblock to operate on + * @kill_dirty: flag to guide handling of dirty inodes * * Attempts to free all inodes for a given superblock. If there were any * busy inodes return a non-zero value, else zero. + * If @kill_dirty is set, discard dirty inodes too, otherwise treat + * them as busy. */ -int invalidate_inodes(struct super_block *sb) +int invalidate_inodes(struct super_block *sb, bool kill_dirty) { int busy = 0; struct inode *inode, *next; @@ -564,6 +567,10 @@ int invalidate_inodes(struct super_block *sb) list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) { if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) continue; + if (inode->i_state & I_DIRTY && !kill_dirty) { + busy = 1; + continue; + } if (atomic_read(&inode->i_count)) { busy = 1; continue; |