From: Amir Goldstein <amir73il@gmail.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Miklos Szeredi <mszeredi@redhat.com>
Subject: Re: [PATCH v2 (v4.18 regression fix)] vfs: don't evict uninitialized inode
Date: Thu, 12 Jul 2018 19:29:38 +0300 [thread overview]
Message-ID: <CAOQ4uxjYxhiBgsVEzpx6Z=f56KFK61gr9R_WAkadKNHiQAFaAg@mail.gmail.com> (raw)
In-Reply-To: <20180706204521.29654-1-mszeredi@redhat.com>
On Fri, Jul 6, 2018 at 11:45 PM, Miklos Szeredi <mszeredi@redhat.com> wrote:
> iput() ends up calling ->evict() on new inode, which is not yet initialized
> by owning fs. So use destroy_inode() instead.
>
> Add to sb->s_inodes list only if inode is not in I_CREATING state (meaning
> that it wasn't allocated with new_inode(), which already does the
> insertion).
>
> Reported-by: Al Viro <viro@zeniv.linux.org.uk>
> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> Fixes: 80ea09a002bf ("vfs: factor out inode_insert5()")
> ---
Al,
Did you loose track of this 4.18 regression fix?
Thanks,
Amir.
> fs/inode.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/inode.c b/fs/inode.c
> index 04dd7e0d5142..e7de38c1d9d8 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -1050,6 +1050,7 @@ struct inode *inode_insert5(struct inode *inode, unsigned long hashval,
> {
> struct hlist_head *head = inode_hashtable + hash(inode->i_sb, hashval);
> struct inode *old;
> + bool creating = inode->i_state & I_CREATING;
>
> again:
> spin_lock(&inode_hash_lock);
> @@ -1083,6 +1084,8 @@ struct inode *inode_insert5(struct inode *inode, unsigned long hashval,
> inode->i_state |= I_NEW;
> hlist_add_head(&inode->i_hash, head);
> spin_unlock(&inode->i_lock);
> + if (!creating)
> + inode_sb_list_add(inode);
> unlock:
> spin_unlock(&inode_hash_lock);
>
> @@ -1117,12 +1120,12 @@ struct inode *iget5_locked(struct super_block *sb, unsigned long hashval,
> struct inode *inode = ilookup5(sb, hashval, test, data);
>
> if (!inode) {
> - struct inode *new = new_inode(sb);
> + struct inode *new = alloc_inode(sb);
>
> if (new) {
> inode = inode_insert5(new, hashval, test, set, data);
> if (unlikely(inode != new))
> - iput(new);
> + destroy_inode(new);
> }
> }
> return inode;
> --
> 2.14.3
>
next prev parent reply other threads:[~2018-07-12 16:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-06 20:45 [PATCH v2 (v4.18 regression fix)] vfs: don't evict uninitialized inode Miklos Szeredi
2018-07-12 16:29 ` Amir Goldstein [this message]
2018-07-18 11:40 ` Miklos Szeredi
2018-07-18 12:18 ` Al Viro
2018-07-18 12:24 ` Miklos Szeredi
2018-07-19 21:45 ` Al Viro
2018-07-20 8:32 ` Miklos Szeredi
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='CAOQ4uxjYxhiBgsVEzpx6Z=f56KFK61gr9R_WAkadKNHiQAFaAg@mail.gmail.com' \
--to=amir73il@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--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).