LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] af_unix: coding style: remove one level of indentation in unix_shutdown()
@ 2011-01-19 14:56 Ian Molton
2011-01-20 7:41 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ian Molton @ 2011-01-19 14:56 UTC (permalink / raw)
Cc: davem, eric.dumazet, ebiederm, xemul, davidel, netdev,
linux-kernel, ian.molton, Alban Crequy
From: Alban Crequy <alban.crequy@collabora.co.uk>
Signed-off-by: Alban Crequy <alban.crequy@collabora.co.uk>
Reviewed-by: Ian Molton <ian.molton@collabora.co.uk>
---
net/unix/af_unix.c | 60 ++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index dd419d2..7c45b93 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1978,36 +1978,38 @@ static int unix_shutdown(struct socket *sock, int mode)
mode = (mode+1)&(RCV_SHUTDOWN|SEND_SHUTDOWN);
- if (mode) {
- unix_state_lock(sk);
- sk->sk_shutdown |= mode;
- other = unix_peer(sk);
- if (other)
- sock_hold(other);
- unix_state_unlock(sk);
- sk->sk_state_change(sk);
-
- if (other &&
- (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET)) {
-
- int peer_mode = 0;
-
- if (mode&RCV_SHUTDOWN)
- peer_mode |= SEND_SHUTDOWN;
- if (mode&SEND_SHUTDOWN)
- peer_mode |= RCV_SHUTDOWN;
- unix_state_lock(other);
- other->sk_shutdown |= peer_mode;
- unix_state_unlock(other);
- other->sk_state_change(other);
- if (peer_mode == SHUTDOWN_MASK)
- sk_wake_async(other, SOCK_WAKE_WAITD, POLL_HUP);
- else if (peer_mode & RCV_SHUTDOWN)
- sk_wake_async(other, SOCK_WAKE_WAITD, POLL_IN);
- }
- if (other)
- sock_put(other);
+ if (!mode)
+ return 0;
+
+ unix_state_lock(sk);
+ sk->sk_shutdown |= mode;
+ other = unix_peer(sk);
+ if (other)
+ sock_hold(other);
+ unix_state_unlock(sk);
+ sk->sk_state_change(sk);
+
+ if (other &&
+ (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET)) {
+
+ int peer_mode = 0;
+
+ if (mode&RCV_SHUTDOWN)
+ peer_mode |= SEND_SHUTDOWN;
+ if (mode&SEND_SHUTDOWN)
+ peer_mode |= RCV_SHUTDOWN;
+ unix_state_lock(other);
+ other->sk_shutdown |= peer_mode;
+ unix_state_unlock(other);
+ other->sk_state_change(other);
+ if (peer_mode == SHUTDOWN_MASK)
+ sk_wake_async(other, SOCK_WAKE_WAITD, POLL_HUP);
+ else if (peer_mode & RCV_SHUTDOWN)
+ sk_wake_async(other, SOCK_WAKE_WAITD, POLL_IN);
}
+ if (other)
+ sock_put(other);
+
return 0;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] af_unix: coding style: remove one level of indentation in unix_shutdown()
2011-01-19 14:56 [PATCH] af_unix: coding style: remove one level of indentation in unix_shutdown() Ian Molton
@ 2011-01-20 7:41 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-01-20 7:41 UTC (permalink / raw)
To: ian.molton
Cc: eric.dumazet, ebiederm, xemul, davidel, netdev, linux-kernel,
alban.crequy
From: Ian Molton <ian.molton@collabora.co.uk>
Date: Wed, 19 Jan 2011 14:56:36 +0000
> From: Alban Crequy <alban.crequy@collabora.co.uk>
>
> Signed-off-by: Alban Crequy <alban.crequy@collabora.co.uk>
> Reviewed-by: Ian Molton <ian.molton@collabora.co.uk>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-20 7:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-19 14:56 [PATCH] af_unix: coding style: remove one level of indentation in unix_shutdown() Ian Molton
2011-01-20 7:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).