diff options
| author | Paul Gortmaker | 2010-12-31 19:59:31 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-01-01 22:57:55 +0100 |
| commit | 25860c3bd5bd1db236d4fd5826d76127d677dc28 (patch) | |
| tree | 68ad705820b95452a49574e056c89d61cd1b69e5 /net/tipc/socket.c | |
| parent | tipc: remove pointless check for NULL prior to kfree (diff) | |
| download | kernel-qcow2-linux-25860c3bd5bd1db236d4fd5826d76127d677dc28.tar.gz kernel-qcow2-linux-25860c3bd5bd1db236d4fd5826d76127d677dc28.tar.xz kernel-qcow2-linux-25860c3bd5bd1db236d4fd5826d76127d677dc28.zip | |
tipc: recode getsockopt error handling for better readability
The existing code for the copy to user and error handling at the
end of getsockopt isn't easy to follow, due to the excessive use
of if/else. By simply using return where appropriate, it can be
made smaller and easier to follow at the same time.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index f972c0b4a719..1a2eb23c6223 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1755,20 +1755,16 @@ static int getsockopt(struct socket *sock, release_sock(sk); - if (res) { - /* "get" failed */ - } - else if (len < sizeof(value)) { - res = -EINVAL; - } - else if (copy_to_user(ov, &value, sizeof(value))) { - res = -EFAULT; - } - else { - res = put_user(sizeof(value), ol); - } + if (res) + return res; /* "get" failed */ - return res; + if (len < sizeof(value)) + return -EINVAL; + + if (copy_to_user(ov, &value, sizeof(value))) + return -EFAULT; + + return put_user(sizeof(value), ol); } /** |