summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-05 01:40:39 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 22:47:46 +0200
commitbe7ce4161f9e6bf2497f90337d1214aa6ee06e15 (patch)
treea9bf28ff703a81ebf309d470c68ae6aa788a2d36
parentunify fs/inode.c callers of clear_inode() (diff)
downloadlinux-be7ce4161f9e6bf2497f90337d1214aa6ee06e15.tar.xz
linux-be7ce4161f9e6bf2497f90337d1214aa6ee06e15.zip
New method - evict_inode()
Hybrid of ->clear_inode() and ->delete_inode(); if present, does all fs work to be done when in-core inode is about to be gone, for whatever reason. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/inode.c4
-rw-r--r--include/linux/fs.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 60cb25969762..474a72f571a4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -325,7 +325,9 @@ static void evict(struct inode *inode, int delete)
{
const struct super_operations *op = inode->i_sb->s_op;
- if (delete && op->delete_inode) {
+ if (op->evict_inode) {
+ op->evict_inode(inode);
+ } else if (delete && op->delete_inode) {
op->delete_inode(inode);
} else {
if (inode->i_data.nrpages)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 218693d8d446..ce50be4b0b41 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1563,6 +1563,7 @@ struct super_operations {
void (*dirty_inode) (struct inode *);
int (*write_inode) (struct inode *, struct writeback_control *wbc);
void (*drop_inode) (struct inode *);
+ void (*evict_inode) (struct inode *);
void (*delete_inode) (struct inode *);
void (*put_super) (struct super_block *);
void (*write_super) (struct super_block *);