The patch titled
vfs: kill->put_inode
has been added to the -mm tree. Its filename is
vfs-kill-put_inode.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: vfs: kill->put_inode
From: Christoph Hellwig <hch@xxxxxx>
With the patch to affs killing the last put_inode() instance we can finally,
after many years of transition kill this racy and awkward interface.
(It's kinda funny that even the description in
Documentation/filesystems/vfs.txt was entirely wrong..)
Also remove a very misleading comment above the defintion of struct
super_operations.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/Locking | 2 --
Documentation/filesystems/vfs.txt | 4 ----
fs/inode.c | 3 ---
include/linux/fs.h | 5 -----
4 files changed, 14 deletions(-)
diff -puN Documentation/filesystems/Locking~vfs-kill-put_inode Documentation/filesystems/Locking
--- a/Documentation/filesystems/Locking~vfs-kill-put_inode
+++ a/Documentation/filesystems/Locking
@@ -92,7 +92,6 @@ prototypes:
void (*destroy_inode)(struct inode *);
void (*dirty_inode) (struct inode *);
int (*write_inode) (struct inode *, int);
- void (*put_inode) (struct inode *);
void (*drop_inode) (struct inode *);
void (*delete_inode) (struct inode *);
void (*put_super) (struct super_block *);
@@ -115,7 +114,6 @@ alloc_inode: no no no
destroy_inode: no
dirty_inode: no (must not sleep)
write_inode: no
-put_inode: no
drop_inode: no !!!inode_lock!!!
delete_inode: no
put_super: yes yes no
diff -puN Documentation/filesystems/vfs.txt~vfs-kill-put_inode Documentation/filesystems/vfs.txt
--- a/Documentation/filesystems/vfs.txt~vfs-kill-put_inode
+++ a/Documentation/filesystems/vfs.txt
@@ -205,7 +205,6 @@ struct super_operations {
void (*dirty_inode) (struct inode *);
int (*write_inode) (struct inode *, int);
- void (*put_inode) (struct inode *);
void (*drop_inode) (struct inode *);
void (*delete_inode) (struct inode *);
void (*put_super) (struct super_block *);
@@ -246,9 +245,6 @@ or bottom half).
inode to disc. The second parameter indicates whether the write
should be synchronous or not, not all filesystems check this flag.
- put_inode: called when the VFS inode is removed from the inode
- cache.
-
drop_inode: called when the last access to the inode is dropped,
with the inode_lock spinlock held.
diff -puN fs/inode.c~vfs-kill-put_inode fs/inode.c
--- a/fs/inode.c~vfs-kill-put_inode
+++ a/fs/inode.c
@@ -1153,9 +1153,6 @@ void iput(struct inode *inode)
BUG_ON(inode->i_state == I_CLEAR);
- if (op && op->put_inode)
- op->put_inode(inode);
-
if (atomic_dec_and_lock(&inode->i_count, &inode_lock))
iput_final(inode);
}
diff -puN include/linux/fs.h~vfs-kill-put_inode include/linux/fs.h
--- a/include/linux/fs.h~vfs-kill-put_inode
+++ a/include/linux/fs.h
@@ -1289,17 +1289,12 @@ extern ssize_t vfs_readv(struct file *,
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
-/*
- * NOTE: write_inode, delete_inode, clear_inode, put_inode can be called
- * without the big kernel lock held in all filesystems.
- */
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
void (*destroy_inode)(struct inode *);
void (*dirty_inode) (struct inode *);
int (*write_inode) (struct inode *, int);
- void (*put_inode) (struct inode *);
void (*drop_inode) (struct inode *);
void (*delete_inode) (struct inode *);
void (*put_super) (struct super_block *);
_
Patches currently in -mm which might be from hch@xxxxxx are
origin.patch
vfs-remove-lives_below_in_same_fs.patch
vfs-fix-unconditional-write_super-call-in-file_fsync.patch
procfs-task-exe-symlink.patch
sysv-fs-remove-superfluous-check-for-__gnuc__-compiler.patch
git-cifs.patch
git-unionfs.patch
git-xfs.patch
signals-do_tkill-dont-use-tasklist_lock-comment.patch
mxser-convert-large-macros-to-functions.patch
reiserfs-use-open_bdev_excl.patch
affs-fix-reservation-discarding.patch
vfs-kill-put_inode.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
