From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [RFC PATCH 55/62] fuse: switch to ->free_inode()
Date: Tue, 16 Apr 2019 18:53:33 +0100 [thread overview]
Message-ID: <20190416175340.21068-55-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20190416175340.21068-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
fuse_destroy_inode() is gone - sanity checks that need the stack
trace of the caller get moved into ->evict_inode(), the rest joins
the RCU-delayed part which becomes ->free_inode().
While we are at it, don't just pass the address of what happens
to be the first member of structure to kmem_cache_free() -
get_fuse_inode() is there for purpose and it gives the proper
container_of() use. No behaviour change, but verifying correctness
is easier that way.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/fuse/inode.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index ec5d9953dfb6..f485d09d14df 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -107,34 +107,30 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)
return inode;
}
-static void fuse_i_callback(struct rcu_head *head)
-{
- struct inode *inode = container_of(head, struct inode, i_rcu);
- kmem_cache_free(fuse_inode_cachep, inode);
-}
-
-static void fuse_destroy_inode(struct inode *inode)
+static void fuse_free_inode(struct inode *inode)
{
struct fuse_inode *fi = get_fuse_inode(inode);
- if (S_ISREG(inode->i_mode) && !is_bad_inode(inode)) {
- WARN_ON(!list_empty(&fi->write_files));
- WARN_ON(!list_empty(&fi->queued_writes));
- }
+
mutex_destroy(&fi->mutex);
kfree(fi->forget);
- call_rcu(&inode->i_rcu, fuse_i_callback);
+ kmem_cache_free(fuse_inode_cachep, fi);
}
static void fuse_evict_inode(struct inode *inode)
{
+ struct fuse_inode *fi = get_fuse_inode(inode);
+
truncate_inode_pages_final(&inode->i_data);
clear_inode(inode);
if (inode->i_sb->s_flags & SB_ACTIVE) {
struct fuse_conn *fc = get_fuse_conn(inode);
- struct fuse_inode *fi = get_fuse_inode(inode);
fuse_queue_forget(fc, fi->forget, fi->nodeid, fi->nlookup);
fi->forget = NULL;
}
+ if (S_ISREG(inode->i_mode) && !is_bad_inode(inode)) {
+ WARN_ON(!list_empty(&fi->write_files));
+ WARN_ON(!list_empty(&fi->queued_writes));
+ }
}
static int fuse_remount_fs(struct super_block *sb, int *flags, char *data)
@@ -814,7 +810,7 @@ static const struct export_operations fuse_export_operations = {
static const struct super_operations fuse_super_operations = {
.alloc_inode = fuse_alloc_inode,
- .destroy_inode = fuse_destroy_inode,
+ .free_inode = fuse_free_inode,
.evict_inode = fuse_evict_inode,
.write_inode = fuse_write_inode,
.drop_inode = generic_delete_inode,
--
2.11.0
next prev parent reply other threads:[~2019-04-16 17:55 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 17:49 [RFC][PATCHSET] sorting out RCU-delayed stuff in ->destroy_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 01/62] securityfs: fix use-after-free on symlink traversal Al Viro
2019-04-16 17:52 ` [RFC PATCH 02/62] apparmorfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 03/62] new inode method: ->free_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 04/62] spufs: switch to ->free_inode() Al Viro
2019-04-16 17:52 ` [RFC PATCH 05/62] erofs: " Al Viro
2019-04-18 14:01 ` Gao Xiang
2019-04-16 17:52 ` [RFC PATCH 06/62] 9p: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 07/62] adfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 08/62] affs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 09/62] befs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 10/62] bfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 11/62] bdev: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 12/62] cifs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 13/62] debugfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 14/62] efs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 15/62] ext2: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 16/62] f2fs: " Al Viro
2019-04-20 2:52 ` Chao Yu
2019-04-16 17:52 ` [RFC PATCH 17/62] fat: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 18/62] freevxfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 19/62] gfs2: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 20/62] hfs: " Al Viro
2019-04-16 17:52 ` [RFC PATCH 21/62] hfsplus: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 22/62] hostfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 23/62] hpfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 24/62] isofs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 25/62] jffs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 26/62] minix: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 27/62] nfs{,4}: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 28/62] nilfs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 29/62] dlmfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 30/62] ocfs2: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 31/62] openpromfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 32/62] procfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 33/62] qnx4: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 34/62] qnx6: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 35/62] reiserfs: convert " Al Viro
2019-04-16 17:53 ` [RFC PATCH 36/62] romfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 37/62] squashfs: switch " Al Viro
2019-04-16 17:53 ` [RFC PATCH 38/62] ubifs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 39/62] udf: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 40/62] sysv: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 41/62] coda: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 42/62] ufs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 43/62] mqueue: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 44/62] bpf: " Al Viro
2019-04-16 18:07 ` Alexei Starovoitov
2019-04-16 21:34 ` Song Liu
2019-04-16 17:53 ` [RFC PATCH 45/62] rpcpipe: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 46/62] apparmor: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 47/62] securityfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 48/62] ntfs: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 49/62] dax: make use of ->free_inode() Al Viro
2019-04-18 12:16 ` Jan Kara
2019-04-18 16:58 ` Dan Williams
2019-04-16 17:53 ` [RFC PATCH 50/62] afs: switch to " Al Viro
2019-04-16 17:53 ` [RFC PATCH 51/62] btrfs: use ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 52/62] ceph: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 53/62] ecryptfs: make use of ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 54/62] ext4: " Al Viro
2019-04-18 12:10 ` Jan Kara
2019-04-16 17:53 ` Al Viro [this message]
2019-04-16 17:53 ` [RFC PATCH 56/62] jfs: switch to ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 57/62] overlayfs: make use of ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 58/62] hugetlb: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 59/62] shmem: " Al Viro
2019-04-16 17:53 ` [RFC PATCH 60/62] orangefs: " Al Viro
2019-04-22 21:14 ` Mike Marshall
2019-04-22 21:56 ` Linus Torvalds
2019-04-22 23:10 ` Al Viro
2019-04-22 23:17 ` Mike Marshall
2019-04-16 17:53 ` [RFC PATCH 61/62] sockfs: switch to ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 62/62] coallocate socket->wq with socket itself Al Viro
2019-04-16 18:01 ` [RFC][PATCHSET] sorting out RCU-delayed stuff in ->destroy_inode() Linus Torvalds
2019-04-30 3:09 ` Al Viro
[not found] ` <CAHk-=wiMvCR0iENUVorfU-3EMC7G8RNSeHSQrz9tndP1uSg2BQ@mail.gmail.com>
2019-04-30 4:00 ` Al Viro
2019-05-01 1:59 ` Al Viro
2019-04-30 4:18 ` Andreas Dilger
2019-04-30 4:26 ` Al Viro
2019-04-30 5:26 ` Andreas Dilger
2019-04-17 15:55 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190416175340.21068-55-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).