diff options
| author | Patrick Caulfield <pcaulfie@redhat.com> | 2007-01-22 14:50:10 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-02-05 13:37:23 -0500 |
| commit | f2f5095f9e63db57faa7cb082e958910ecdd7ad4 (patch) | |
| tree | 42344ef03a046bd6c9cf8ca5b14a693094a70e3f | |
| parent | 1c0f4872dc4bbeb2223a300517099786211fce83 (diff) | |
| download | kernel_samsung_aries-f2f5095f9e63db57faa7cb082e958910ecdd7ad4.zip kernel_samsung_aries-f2f5095f9e63db57faa7cb082e958910ecdd7ad4.tar.gz kernel_samsung_aries-f2f5095f9e63db57faa7cb082e958910ecdd7ad4.tar.bz2 | |
[DLM] lowcomms tidy
This patch removes some redundant fields from the connection structure and adds
some lockdep annotation to remove spurious warnings.
Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -rw-r--r-- | fs/dlm/lowcomms-tcp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/dlm/lowcomms-tcp.c b/fs/dlm/lowcomms-tcp.c index 86e5f81..6e27201 100644 --- a/fs/dlm/lowcomms-tcp.c +++ b/fs/dlm/lowcomms-tcp.c @@ -97,9 +97,6 @@ struct connection { struct socket *sock; /* NULL if not connected */ uint32_t nodeid; /* So we know who we are in the list */ struct rw_semaphore sock_sem; /* Stop connect races */ - struct list_head read_list; /* On this list when ready for reading */ - struct list_head write_list; /* On this list when ready for writing */ - struct list_head state_list; /* On this list when ready to connect */ unsigned long flags; /* bit 1,2 = We are on the read/write lists */ #define CF_READ_PENDING 1 #define CF_WRITE_PENDING 2 @@ -391,7 +388,7 @@ static int accept_from_sock(struct connection *con) if (result < 0) return -ENOMEM; - down_read(&con->sock_sem); + down_read_nested(&con->sock_sem, 0); result = -ENOTCONN; if (con->sock == NULL) @@ -434,7 +431,7 @@ static int accept_from_sock(struct connection *con) result = -ENOMEM; goto accept_err; } - down_write(&newcon->sock_sem); + down_write_nested(&newcon->sock_sem, 1); if (newcon->sock) { struct connection *othercon = newcon->othercon; |