[PATCH 2/5] net: Use helper function fdput()

Subsystems: networking [general], networking [sockets], the rest

STALE2224d

2 messages, 2 authors, 2020-08-08 · open the first message on its own page

[PATCH 2/5] net: Use helper function fdput()

From: linmiaohe <linmiaohe@huawei.com>
Date: 2020-08-06 20:01:49

From: Miaohe Lin <linmiaohe@huawei.com>

Use helper function fdput() to fput() the file iff FDPUT_FPUT is set.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 net/socket.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 976426d03f09..6aff5aeb6728 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1805,8 +1805,7 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
 		ret = __sys_accept4_file(f.file, 0, upeer_sockaddr,
 						upeer_addrlen, flags,
 						rlimit(RLIMIT_NOFILE));
-		if (f.flags)
-			fput(f.file);
+		fdput(f);
 	}
 
 	return ret;
@@ -1869,8 +1868,7 @@ int __sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen)
 		ret = move_addr_to_kernel(uservaddr, addrlen, &address);
 		if (!ret)
 			ret = __sys_connect_file(f.file, &address, addrlen, 0);
-		if (f.flags)
-			fput(f.file);
+		fdput(f);
 	}
 
 	return ret;
-- 
2.19.1

Re: [PATCH 2/5] net: Use helper function fdput()

From: David Miller <davem@davemloft.net>
Date: 2020-08-08 21:21:06

From: linmiaohe <linmiaohe@huawei.com>
Date: Thu, 6 Aug 2020 19:52:24 +0800
From: Miaohe Lin <linmiaohe@huawei.com>

Use helper function fdput() to fput() the file iff FDPUT_FPUT is set.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help