From: Paolo Bonzini <pbonzini@redhat.com>
To: Christian Brauner <brauner@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Sean Christopherson <seanjc@google.com>
Cc: Ackerley Tng <ackerleytng@google.com>,
Chao Peng <chao.p.peng@linux.intel.com>,
Isaku Yamahata <isaku.yamahata@intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Michael Roth <michael.roth@amd.com>,
Yu Zhang <yu.c.zhang@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the kvm-x86 tree
Date: Mon, 30 Oct 2023 12:27:07 +0100 [thread overview]
Message-ID: <3ed75fa4-6b49-4fd2-a907-8619ca19a8b8@redhat.com> (raw)
In-Reply-To: <20231030-ignorant-liebschaft-6d603ab43494@brauner>
On 10/30/23 11:05, Christian Brauner wrote:
>
> @Paolo and @Sean, does that make sense and is the series for v6.7 or
> just already in -next for v6.8?
It's for 6.8. Thanks for the fixup!
Paolo
> diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
> index 94bc478c26f3..a4c194b0b22c 100644
> --- a/virt/kvm/guest_memfd.c
> +++ b/virt/kvm/guest_memfd.c
> @@ -272,17 +272,7 @@ static int kvm_gmem_release(struct inode *inode, struct file *file)
>
> static struct file *kvm_gmem_get_file(struct kvm_memory_slot *slot)
> {
> - struct file *file;
> -
> - rcu_read_lock();
> -
> - file = rcu_dereference(slot->gmem.file);
> - if (file && !get_file_rcu(file))
> - file = NULL;
> -
> - rcu_read_unlock();
> -
> - return file;
> + return get_file_active(&slot->gmem.file);
> }
>
> static struct file_operations kvm_gmem_fops = {
>
next prev parent reply other threads:[~2023-10-30 11:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 2:48 linux-next: build failure after merge of the kvm-x86 tree Stephen Rothwell
2023-10-30 10:05 ` Christian Brauner
2023-10-30 11:27 ` Paolo Bonzini [this message]
2023-10-30 20:37 ` Stephen Rothwell
2023-10-30 21:05 ` Sean Christopherson
2023-10-30 21:10 ` Stephen Rothwell
2023-10-31 13:42 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 4:00 Stephen Rothwell
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=3ed75fa4-6b49-4fd2-a907-8619ca19a8b8@redhat.com \
--to=pbonzini@redhat.com \
--cc=ackerleytng@google.com \
--cc=brauner@kernel.org \
--cc=chao.p.peng@linux.intel.com \
--cc=isaku.yamahata@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=seanjc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=yu.c.zhang@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox