diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-04 19:40:39 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:46 -0400 |
commit | be7ce4161f9e6bf2497f90337d1214aa6ee06e15 (patch) | |
tree | a9bf28ff703a81ebf309d470c68ae6aa788a2d36 | |
parent | b4272d4c810532e1a4dea111433a0af56d3bd2b7 (diff) |
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.c | 4 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
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) | |||
325 | { | 325 | { |
326 | const struct super_operations *op = inode->i_sb->s_op; | 326 | const struct super_operations *op = inode->i_sb->s_op; |
327 | 327 | ||
328 | if (delete && op->delete_inode) { | 328 | if (op->evict_inode) { |
329 | op->evict_inode(inode); | ||
330 | } else if (delete && op->delete_inode) { | ||
329 | op->delete_inode(inode); | 331 | op->delete_inode(inode); |
330 | } else { | 332 | } else { |
331 | if (inode->i_data.nrpages) | 333 | 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 { | |||
1563 | void (*dirty_inode) (struct inode *); | 1563 | void (*dirty_inode) (struct inode *); |
1564 | int (*write_inode) (struct inode *, struct writeback_control *wbc); | 1564 | int (*write_inode) (struct inode *, struct writeback_control *wbc); |
1565 | void (*drop_inode) (struct inode *); | 1565 | void (*drop_inode) (struct inode *); |
1566 | void (*evict_inode) (struct inode *); | ||
1566 | void (*delete_inode) (struct inode *); | 1567 | void (*delete_inode) (struct inode *); |
1567 | void (*put_super) (struct super_block *); | 1568 | void (*put_super) (struct super_block *); |
1568 | void (*write_super) (struct super_block *); | 1569 | void (*write_super) (struct super_block *); |