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

Commit 73092892 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging:lustre: lib-socket.c code cleanup - indentation etc 



Handle all the style issues reported by checkpatch.pl.
Remove general white spaces, spaces in function calls,
etc.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c2414ef

drivers/staging/lustre/lnet/lnet/lib-socket.c

+92 −111
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ lnet_ipif_query (char *name, int *up, __u32 *ip, __u32 *mask) 
		*ip = *mask = 0;

		return 0;

	}



	*up = 1;



	strcpy(ifr.ifr_name, name);
@@ -143,7 +142,6 @@ lnet_ipif_query (char *name, int *up, __u32 *ip, __u32 *mask) 


	return 0;

}



EXPORT_SYMBOL(lnet_ipif_query);



int
@@ -160,7 +158,6 @@ lnet_ipif_enumerate (char ***namesp) 
	int nob;

	int i;





	nalloc = 16;	/* first guess at max interfaces */

	toobig = 0;

	for (;;) {
@@ -173,7 +170,8 @@ lnet_ipif_enumerate (char ***namesp) 


		LIBCFS_ALLOC(ifr, nalloc * sizeof(*ifr));

		if (ifr == NULL) {

			CERROR ("ENOMEM enumerating up to %d interfaces\n", nalloc);

			CERROR("ENOMEM enumerating up to %d interfaces\n",

			       nalloc);

			rc = -ENOMEM;

			goto out0;

		}
@@ -209,7 +207,6 @@ lnet_ipif_enumerate (char ***namesp) 
	}



	for (i = 0; i < nfound; i++) {



		nob = strnlen(ifr[i].ifr_name, IFNAMSIZ);

		if (nob == IFNAMSIZ) {

			/* no space for terminating NULL */
@@ -240,7 +237,6 @@ lnet_ipif_enumerate (char ***namesp) 
out0:

	return rc;

}



EXPORT_SYMBOL(lnet_ipif_enumerate);



void
@@ -255,7 +251,6 @@ lnet_ipif_free_enumeration (char **names, int n) 


	LIBCFS_FREE(names, n * sizeof(*names));

}



EXPORT_SYMBOL(lnet_ipif_free_enumeration);



int
@@ -315,7 +310,6 @@ lnet_sock_write (struct socket *sock, void *buffer, int nob, int timeout) 
		buffer = ((char *)buffer) + rc;

		nob -= rc;

	}



	return 0;

}

EXPORT_SYMBOL(lnet_sock_write);
@@ -373,12 +367,11 @@ lnet_sock_read (struct socket *sock, void *buffer, int nob, int timeout) 
			return -ETIMEDOUT;

	}

}



EXPORT_SYMBOL(lnet_sock_read);



static int

lnet_sock_create (struct socket **sockp, int *fatal,

		    __u32 local_ip, int local_port)

lnet_sock_create(struct socket **sockp, int *fatal, __u32 local_ip,

		 int local_port)

{

	struct sockaddr_in locaddr;

	struct socket *sock;
@@ -423,7 +416,6 @@ lnet_sock_create (struct socket **sockp, int *fatal, 
			goto failed;

		}

	}



	return 0;



failed:
@@ -458,10 +450,8 @@ lnet_sock_setbuf (struct socket *sock, int txbufsize, int rxbufsize) 
			return rc;

		}

	}



	return 0;

}



EXPORT_SYMBOL(lnet_sock_setbuf);



int
@@ -489,29 +479,24 @@ lnet_sock_getaddr (struct socket *sock, bool remote, __u32 *ip, int *port) 


	return 0;

}



EXPORT_SYMBOL(lnet_sock_getaddr);



int

lnet_sock_getbuf(struct socket *sock, int *txbufsize, int *rxbufsize)

{



	if (txbufsize != NULL) {

	if (txbufsize != NULL)

		*txbufsize = sock->sk->sk_sndbuf;

	}



	if (rxbufsize != NULL) {

	if (rxbufsize != NULL)

		*rxbufsize = sock->sk->sk_rcvbuf;

	}



	return 0;

}



EXPORT_SYMBOL(lnet_sock_getbuf);



int

lnet_sock_listen (struct socket **sockp,

		    __u32 local_ip, int local_port, int backlog)

lnet_sock_listen(struct socket **sockp, __u32 local_ip, int local_port,

		 int backlog)

{

	int fatal;

	int rc;
@@ -532,7 +517,6 @@ lnet_sock_listen (struct socket **sockp, 
	sock_release(*sockp);

	return rc;

}



EXPORT_SYMBOL(lnet_sock_listen);



int
@@ -575,13 +559,11 @@ lnet_sock_accept (struct socket **newsockp, struct socket *sock) 
	sock_release(newsock);

	return rc;

}



EXPORT_SYMBOL(lnet_sock_accept);



int

lnet_sock_connect (struct socket **sockp, int *fatal,

		     __u32 local_ip, int local_port,

		     __u32 peer_ip, int peer_port)

lnet_sock_connect(struct socket **sockp, int *fatal, __u32 local_ip,

		  int local_port, __u32 peer_ip, int peer_port)

{

	struct sockaddr_in srvaddr;

	int rc;
@@ -613,5 +595,4 @@ lnet_sock_connect (struct socket **sockp, int *fatal, 
	sock_release(*sockp);

	return rc;

}



EXPORT_SYMBOL(lnet_sock_connect);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+2 −2

File changed.

Contains only whitespace changes.