projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct .gbs.conf settings
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
32df584
..
a19ae19
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-450,16
+450,17
@@
EXPORT_SYMBOL(sockfd_lookup);
static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
{
static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
{
- struct f
ile *file
;
+ struct f
d f = fdget(fd)
;
struct socket *sock;
*err = -EBADF;
struct socket *sock;
*err = -EBADF;
- file = fget_light(fd, fput_needed);
- if (file) {
- sock = sock_from_file(file, err);
- if (sock)
+ if (f.file) {
+ sock = sock_from_file(f.file, err);
+ if (likely(sock)) {
+ *fput_needed = f.flags;
return sock;
return sock;
- fput_light(file, *fput_needed);
+ }
+ fdput(f);
}
return NULL;
}
}
return NULL;
}