Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2f5095f authored by Patrick Caulfield's avatar Patrick Caulfield Committed by Steven Whitehouse
Browse files

[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: default avatarPatrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1c0f4872

fs/dlm/lowcomms-tcp.c

+2 −5
Original line number Diff line number Diff line
@@ -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;