netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <ye.xingchen@zte.com.cn>
To: <mst@redhat.com>
Cc: <jasowang@redhat.com>, <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] vhost_net: Use fdget() and fdput()
Date: Fri, 5 May 2023 14:24:04 +0800 (CST)	[thread overview]
Message-ID: <202305051424047152799@zte.com.cn> (raw)

From: Ye Xingchen <ye.xingchen@zte.com.cn>

convert the fget()/fput() uses to fdget()/fdput().

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
---
 drivers/vhost/net.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index ae2273196b0c..5b3fe4805182 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -1466,17 +1466,17 @@ static struct ptr_ring *get_tap_ptr_ring(struct file *file)

 static struct socket *get_tap_socket(int fd)
 {
-	struct file *file = fget(fd);
+	struct fd f = fdget(fd);
 	struct socket *sock;

-	if (!file)
+	if (!f.file)
 		return ERR_PTR(-EBADF);
-	sock = tun_get_socket(file);
+	sock = tun_get_socket(f.file);
 	if (!IS_ERR(sock))
 		return sock;
-	sock = tap_get_socket(file);
+	sock = tap_get_socket(f.file);
 	if (IS_ERR(sock))
-		fput(file);
+		fdput(f);
 	return sock;
 }

-- 
2.25.1

             reply	other threads:[~2023-05-05  6:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05  6:24 ye.xingchen [this message]
2023-05-05  6:45 ` [PATCH] vhost_net: Use fdget() and fdput() Jason Wang
2023-05-05  8:41   ` ye xingchen
2023-05-05 14:59     ` Michael S. Tsirkin
2023-05-11  5:31 ` Al Viro

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=202305051424047152799@zte.com.cn \
    --to=ye.xingchen@zte.com.cn \
    --cc=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.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).