iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DLM] lowcomms tidy

Browse Source 
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>
This commit is contained in:
Patrick Caulfield 2007-01-22 14:50:10 +00:00 committed by Steven Whitehouse
parent 1c0f4872dc
commit f2f5095f9e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/dlm/lowcomms-tcp.c
View File

@ -97,9 +97,6 @@ struct connection {
struct socket *sock; /* NULL if not connected */ struct socket *sock; /* NULL if not connected */
uint32_t nodeid; /* So we know who we are in the list */ uint32_t nodeid; /* So we know who we are in the list */
struct rw_semaphore sock_sem; /* Stop connect races */ 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 */ unsigned long flags; /* bit 1,2 = We are on the read/write lists */
#define CF_READ_PENDING 1 #define CF_READ_PENDING 1
#define CF_WRITE_PENDING 2 #define CF_WRITE_PENDING 2
@ -391,7 +388,7 @@ static int accept_from_sock(struct connection *con)
if (result < 0) if (result < 0)
return -ENOMEM; return -ENOMEM;
down_read(&con->sock_sem); down_read_nested(&con->sock_sem, 0);
result = -ENOTCONN; result = -ENOTCONN;
if (con->sock == NULL) if (con->sock == NULL)
@ -434,7 +431,7 @@ static int accept_from_sock(struct connection *con)
result = -ENOMEM; result = -ENOMEM;
goto accept_err; goto accept_err;
} }
down_write(&newcon->sock_sem); down_write_nested(&newcon->sock_sem, 1);
if (newcon->sock) { if (newcon->sock) {
struct connection *othercon = newcon->othercon; struct connection *othercon = newcon->othercon;