diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-27 14:48:26 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:10:25 -0400 |
| commit | cb0942b81249798e15c3f04eee2946ef543e8115 (patch) | |
| tree | 7d494c580a847342577661782c5173f76178aa81 /net/core/scm.c | |
| parent | cecb46f194460d23cacf3b13593f9f5a4f7a0fed (diff) | |
| download | linux-cb0942b81249798e15c3f04eee2946ef543e8115.tar.gz | |
make get_file() return its argument
simplifies a bunch of callers... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/core/scm.c')
| -rw-r--r-- | net/core/scm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 040cebeed45b..b0098d259233 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -281,11 +281,10 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) break; } /* Bump the usage count and install the file. */ - get_file(fp[i]); sock = sock_from_file(fp[i], &err); if (sock) sock_update_netprioidx(sock->sk, current); - fd_install(new_fd, fp[i]); + fd_install(new_fd, get_file(fp[i])); } if (i > 0) |