staging: lustre: lnet: include: minor whitespace fixes (681fc807) · Commits · 戴 / test

drivers/staging/lustre/include/linux/lnet/api.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -84,7 +84,6 @@ void LNetSnprintHandle(char *str, int str_len, lnet_handle_any_t handle);

		/** @} lnet_addr */


		/** \defgroup lnet_me Match entries
		*
		* A match entry (abbreviated as ME) describes a set of criteria to accept
		@@ -171,7 +170,6 @@ int LNetEQFree(lnet_handle_eq_t eventq_in);
		int LNetEQGet(lnet_handle_eq_t eventq_in,
		lnet_event_t *event_out);


		int LNetEQWait(lnet_handle_eq_t eventq_in,
		lnet_event_t *event_out);

		@@ -204,7 +202,6 @@ int LNetGet(lnet_nid_t self,
		unsigned int offset_in);
		/** @} lnet_data */


		/** \defgroup lnet_misc Miscellaneous operations.
		* Miscellaneous operations.
		* @{ */

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@ lnet_net_lock_current(void)
		#define LNET_LOCK() lnet_net_lock(LNET_LOCK_EX)
		#define LNET_UNLOCK() lnet_net_unlock(LNET_LOCK_EX)


		#define lnet_ptl_lock(ptl) spin_lock(&(ptl)->ptl_lock)
		#define lnet_ptl_unlock(ptl) spin_unlock(&(ptl)->ptl_lock)
		#define lnet_eq_wait_lock() spin_lock(&the_lnet.ln_eq_wait_lock)
		@@ -176,7 +175,6 @@ lnet_net_lock_current(void)
		#define LNET_MUTEX_LOCK(m) mutex_lock(m)
		#define LNET_MUTEX_UNLOCK(m) mutex_unlock(m)


		#define MAX_PORTALS 64

		/* these are only used by code with LNET_USE_LIB_FREELIST, but we still
		@@ -214,7 +212,6 @@ lnet_freelist_free(lnet_freelist_t fl, void obj)
		list_add(&o->fo_list, &fl->fl_list);
		}


		static inline lnet_eq_t *
		lnet_eq_alloc(void)
		{
		@@ -640,7 +637,6 @@ lnet_net2rnethash(__u32 net)

		extern lnd_t the_lolnd;


		int lnet_cpt_of_nid_locked(lnet_nid_t nid);
		int lnet_cpt_of_nid(lnet_nid_t nid);
		lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);
		@@ -809,6 +805,7 @@ lnet_copy_flat2iov(unsigned int ndiov, struct iovec *diov, unsigned int doffset,
		int slen, void *src, unsigned int soffset, unsigned int nob)
		{
		struct iovec siov = {/.iov_base = / src, /.iov_len = /slen};

		lnet_copy_iov2iov(ndiov, diov, doffset,
		1, &siov, soffset, nob);
		}
		@@ -818,6 +815,7 @@ lnet_copy_flat2kiov(unsigned int ndiov, lnet_kiov_t *dkiov, unsigned int doffset
		int slen, void *src, unsigned int soffset, unsigned int nob)
		{
		struct iovec siov = {/* .iov_base = / src, / .iov_len = */ slen};

		lnet_copy_iov2kiov(ndiov, dkiov, doffset,
		1, &siov, soffset, nob);
		}
		@@ -870,5 +868,4 @@ void lnet_peer_tables_destroy(void);
		int lnet_peer_tables_create(void);
		void lnet_debug_peer(lnet_nid_t nid);


		#endif

drivers/staging/lustre/include/linux/lnet/lib-types.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -156,7 +156,6 @@ typedef struct {
		* "stub" reply using their current protocol */
		#define LNET_PROTO_MAGIC 0x45726963 /* ! */


		#define LNET_PROTO_TCP_VERSION_MAJOR 1
		#define LNET_PROTO_TCP_VERSION_MINOR 0

		@@ -225,7 +224,6 @@ typedef struct lnet_msg {
		lnet_hdr_t msg_hdr;
		} lnet_msg_t;


		typedef struct lnet_libhandle {
		struct list_head lh_hash_chain;
		__u64 lh_cookie;

drivers/staging/lustre/include/linux/lnet/linux/api-support.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,5 +39,4 @@
		#error Do not #include this file directly. #include <lnet /api-support.h> instead
		#endif


		#endif

drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ lnet_page2phys (struct page *p)
		}
		}


		#define LNET_ROUTER

		#endif /* __LNET_LINUX_LIB_LNET_H__ */

Admin message