summaryrefslogtreecommitdiffstats
path: root/net/sctp/socket.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-08-12 15:59:47 +0530
committerJiri Kosina <jkosina@suse.cz>2015-09-29 15:15:40 +0200
commitb5ffe634425591db5692fa242da0bbe20d1f76a7 (patch)
tree20380e2ff1c60c8b980629c5bb728106839e6a00 /net/sctp/socket.c
parent18e8e5c7a9f9aef1b45e0729dc340989d5a954d0 (diff)
downloadop-kernel-dev-b5ffe634425591db5692fa242da0bbe20d1f76a7.zip
op-kernel-dev-b5ffe634425591db5692fa242da0bbe20d1f76a7.tar.gz
net: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r--net/sctp/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 17bef01..897c01c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4475,7 +4475,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
}
newfile = sock_alloc_file(newsock, 0, NULL);
- if (unlikely(IS_ERR(newfile))) {
+ if (IS_ERR(newfile)) {
put_unused_fd(retval);
sock_release(newsock);
return PTR_ERR(newfile);
OpenPOWER on IntegriCloud