From: Steve French <smfrench@gmail.com>
To: broonie@kernel.org
Cc: CIFS <linux-cifs@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shyam Prasad N <sprasad@microsoft.com>,
Steve French <stfrench@microsoft.com>
Subject: Re: linux-next: manual merge of the cifs tree with the fscache tree
Date: Fri, 17 Dec 2021 13:38:00 -0600 [thread overview]
Message-ID: <CAH2r5muO9aTksvqD9v+sOQ2z-Xp3Rzbi9mPtfc0ad57jZG5aFw@mail.gmail.com> (raw)
In-Reply-To: <20211216124317.4143405-1-broonie@kernel.org>
David,
This cifs fscache fix should be upstream soon, so you should be able
to update the fscache series ontop of updated kernel soon
On Thu, Dec 16, 2021 at 6:43 AM <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the cifs tree got a conflict in:
>
> fs/cifs/inode.c
>
> between commit:
>
> 830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
>
> from the fscache tree and commit:
>
> 68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")
>
> from the cifs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
> iget_failed(inode);
> inode = ERR_PTR(rc);
> }
> +
> - if (!rc) {
> - /*
> - * The cookie is initialized from volume info returned above.
> - * Inside cifs_fscache_get_super_cookie it checks
> - * that we do not get super cookie twice.
> - */
> - rc = cifs_fscache_get_super_cookie(tcon);
> - if (rc < 0) {
> - iget_failed(inode);
> - inode = ERR_PTR(rc);
> - }
> - }
> -
> out:
> kfree(path);
> free_xid(xid);
--
Thanks,
Steve
next prev parent reply other threads:[~2021-12-17 19:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 12:43 linux-next: manual merge of the cifs tree with the fscache tree broonie
2021-12-17 19:38 ` Steve French [this message]
2021-12-17 19:47 ` David Howells
2021-12-19 23:46 ` Stephen Rothwell
2021-12-20 4:31 ` [EXTERNAL] " Shyam Prasad
2021-12-20 6:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-01-19 22:43 Stephen Rothwell
2021-12-02 22:41 Stephen Rothwell
2021-12-05 21:56 ` Stephen Rothwell
2021-12-07 21:12 ` David Howells
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=CAH2r5muO9aTksvqD9v+sOQ2z-Xp3Rzbi9mPtfc0ad57jZG5aFw@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=broonie@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sprasad@microsoft.com \
--cc=stfrench@microsoft.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.