From: Mike Marshall <hubcap@omnibond.com>
To: Al Viro <viro@zeniv.linux.org.uk>,
Martin Brandenburg <martin@omnibond.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [RFC PATCH 60/62] orangefs: make use of ->free_inode()
Date: Mon, 22 Apr 2019 17:14:19 -0400 [thread overview]
Message-ID: <CAOg9mSQppnRWPnSg9eAm0NeW3XEm0LZ74Aw651QTBx0Gm1jpQA@mail.gmail.com> (raw)
In-Reply-To: <20190416175340.21068-60-viro@ZenIV.linux.org.uk>
Hi Al...
I applied your "new inode method: ->free_inode()" and
"orangefs: make use of ->free_inode()" to our pagecache
branch (I hope to get it pulled in the next merge window).
I had to modify your "orangefs: make use of ->free_inode()" a
little, since Martin Brandenburg had already modified orangefs_i_callback
for the pagecache branch. I don't know for sure that my modifications
aren't nonsense :-) but I do know for sure that everything runs
with no xfstests regressions. I'll see what Martin thinks about
my changes...
orangefs_destroy_inode is pretty much a no-op now, so I guess
we'll get rid of it...
Acked-by: Mike Marshall <hubcap@omnibond.com>
Thanks...
-Mike
[root@vm1 linux]# git diff HEAD^ fs/orangefs/super.c
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index 8fa30c13b7ed..f82ac9373443 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -125,20 +125,18 @@ static struct inode *orangefs_alloc_inode(struct
super_block *sb)
return &orangefs_inode->vfs_inode;
}
-static void orangefs_i_callback(struct rcu_head *head)
+static void orangefs_free_inode(struct inode *inode)
{
- struct inode *inode = container_of(head, struct inode, i_rcu);
- struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);
struct orangefs_cached_xattr *cx;
struct hlist_node *tmp;
int i;
- hash_for_each_safe(orangefs_inode->xattr_cache, i, tmp, cx, node) {
+ hash_for_each_safe(ORANGEFS_I(inode)->xattr_cache, i, tmp, cx, node) {
hlist_del(&cx->node);
kfree(cx);
}
- kmem_cache_free(orangefs_inode_cache, orangefs_inode);
+ kmem_cache_free(orangefs_inode_cache, ORANGEFS_I(inode));
}
static void orangefs_destroy_inode(struct inode *inode)
@@ -148,8 +146,6 @@ static void orangefs_destroy_inode(struct inode *inode)
gossip_debug(GOSSIP_SUPER_DEBUG,
"%s: deallocated %p destroying inode %pU\n",
__func__, orangefs_inode, get_khandle_from_ino(inode));
-
- call_rcu(&inode->i_rcu, orangefs_i_callback);
}
static int orangefs_write_inode(struct inode *inode,
@@ -316,6 +312,7 @@ void fsid_key_table_finalize(void)
static const struct super_operations orangefs_s_ops = {
.alloc_inode = orangefs_alloc_inode,
+ .free_inode = orangefs_free_inode,
.destroy_inode = orangefs_destroy_inode,
.write_inode = orangefs_write_inode,
.drop_inode = generic_delete_inode,
On Tue, Apr 16, 2019 at 1:55 PM Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> From: Al Viro <viro@zeniv.linux.org.uk>
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> fs/orangefs/super.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
> index dfaee90d30bd..3784f7e8b603 100644
> --- a/fs/orangefs/super.c
> +++ b/fs/orangefs/super.c
> @@ -124,11 +124,9 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb)
> return &orangefs_inode->vfs_inode;
> }
>
> -static void orangefs_i_callback(struct rcu_head *head)
> +static void orangefs_free_inode(struct inode *inode)
> {
> - struct inode *inode = container_of(head, struct inode, i_rcu);
> - struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);
> - kmem_cache_free(orangefs_inode_cache, orangefs_inode);
> + kmem_cache_free(orangefs_inode_cache, ORANGEFS_I(inode));
> }
>
> static void orangefs_destroy_inode(struct inode *inode)
> @@ -138,8 +136,6 @@ static void orangefs_destroy_inode(struct inode *inode)
> gossip_debug(GOSSIP_SUPER_DEBUG,
> "%s: deallocated %p destroying inode %pU\n",
> __func__, orangefs_inode, get_khandle_from_ino(inode));
> -
> - call_rcu(&inode->i_rcu, orangefs_i_callback);
> }
>
> /*
> @@ -299,6 +295,7 @@ void fsid_key_table_finalize(void)
>
> static const struct super_operations orangefs_s_ops = {
> .alloc_inode = orangefs_alloc_inode,
> + .free_inode = orangefs_free_inode,
> .destroy_inode = orangefs_destroy_inode,
> .drop_inode = generic_delete_inode,
> .statfs = orangefs_statfs,
> --
> 2.11.0
>
next prev parent reply other threads:[~2019-04-22 21:14 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 ` [RFC PATCH 55/62] fuse: switch to ->free_inode() Al Viro
2019-04-16 17:53 ` [RFC PATCH 56/62] jfs: " 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 [this message]
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=CAOg9mSQppnRWPnSg9eAm0NeW3XEm0LZ74Aw651QTBx0Gm1jpQA@mail.gmail.com \
--to=hubcap@omnibond.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin@omnibond.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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).