summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-05 02:55:25 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 22:47:49 +0200
commitb0683aa638b3326c6fc22e5290dfa75e08bd83f5 (patch)
tree8287f1eff3c76dc7cf6c42208efebb1510b075b2 /fs
parentTake ->i_bdev/->i_cdev handling out of clear_inode() (diff)
downloadlinux-b0683aa638b3326c6fc22e5290dfa75e08bd83f5.tar.xz
linux-b0683aa638b3326c6fc22e5290dfa75e08bd83f5.zip
new helper: end_writeback()
Essentially, the minimal variant of ->evict_inode(). It's a trimmed-down clear_inode(), sans any fs callbacks. Once it returns we know that no async writeback will be happening; every ->evict_inode() instance should do that once and do that before doing anything ->write_inode() could interfere with (e.g. freeing the on-disk inode). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/hugetlbfs/inode.c2
-rw-r--r--fs/inode.c12
2 files changed, 13 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index bf1a2f400e70..6e5bd42f3860 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -374,7 +374,7 @@ static void truncate_hugepages(struct inode *inode, loff_t lstart)
static void hugetlbfs_evict_inode(struct inode *inode)
{
truncate_hugepages(inode, 0);
- clear_inode(inode);
+ end_writeback(inode);
}
static inline void
diff --git a/fs/inode.c b/fs/inode.c
index 9aff7deaf816..93e7a5ecbc26 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -294,6 +294,18 @@ void __iget(struct inode *inode)
inodes_stat.nr_unused--;
}
+void end_writeback(struct inode *inode)
+{
+ might_sleep();
+ BUG_ON(inode->i_data.nrpages);
+ BUG_ON(!list_empty(&inode->i_data.private_list));
+ BUG_ON(!(inode->i_state & I_FREEING));
+ BUG_ON(inode->i_state & I_CLEAR);
+ inode_sync_wait(inode);
+ inode->i_state = I_FREEING | I_CLEAR;
+}
+EXPORT_SYMBOL(end_writeback);
+
/**
* clear_inode - clear an inode
* @inode: inode to clear