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

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

staging: lustre: lnet: use struct bio_vec instead of typedef 



Kill off lnet_kiov_t and use struct bio_vec directly.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f997ffa1

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

+4 −4
Original line number Diff line number Diff line
@@ -612,16 +612,16 @@ int lnet_extract_iov(int dst_niov, struct kvec *dst, 
		     int src_niov, const struct kvec *src,

		      unsigned int offset, unsigned int len);



unsigned int lnet_kiov_nob(unsigned int niov, lnet_kiov_t *iov);

int lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,

		      int src_niov, const lnet_kiov_t *src,

unsigned int lnet_kiov_nob(unsigned int niov, struct bio_vec *iov);

int lnet_extract_kiov(int dst_niov, struct bio_vec *dst,

		      int src_niov, const struct bio_vec *src,

		      unsigned int offset, unsigned int len);



void lnet_copy_iov2iter(struct iov_iter *to,

			unsigned int nsiov, const struct kvec *siov,

			unsigned int soffset, unsigned int nob);

void lnet_copy_kiov2iter(struct iov_iter *to,

			 unsigned int nkiov, const lnet_kiov_t *kiov,

			 unsigned int nkiov, const struct bio_vec *kiov,

			 unsigned int kiovoffset, unsigned int nob);



void lnet_me_unlink(struct lnet_me *me);

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

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct lnet_msg { 
	unsigned int		 msg_offset;

	unsigned int		 msg_niov;

	struct kvec		*msg_iov;

	lnet_kiov_t		*msg_kiov;

	struct bio_vec		*msg_kiov;



	struct lnet_event	 msg_ev;

	struct lnet_hdr		 msg_hdr;
@@ -156,7 +156,7 @@ struct lnet_libmd { 
	unsigned int		 md_niov;	/* # frags */

	union {

		struct kvec	iov[LNET_MAX_IOV];

		lnet_kiov_t	kiov[LNET_MAX_IOV];

		struct bio_vec	kiov[LNET_MAX_IOV];

	} md_iov;

};
@@ -413,7 +413,7 @@ struct lnet_rtrbufpool { 
struct lnet_rtrbuf {

	struct list_head	 rb_list;	/* chain on rbp_bufs */

	struct lnet_rtrbufpool	*rb_pool;	/* owning pool */

	lnet_kiov_t		 rb_kiov[0];	/* the buffer space */

	struct bio_vec		 rb_kiov[0];	/* the buffer space */

};



#define LNET_PEER_HASHSIZE	503	/* prime! */

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

+3 −4
Original line number Diff line number Diff line
@@ -382,9 +382,9 @@ struct lnet_md { 
	 * Specify the memory region associated with the memory descriptor.

	 * If the options field has:

	 * - LNET_MD_KIOV bit set: The start field points to the starting

	 * address of an array of lnet_kiov_t and the length field specifies

	 * address of an array of struct bio_vec and the length field specifies

	 * the number of entries in the array. The length can't be bigger

	 * than LNET_MAX_IOV. The lnet_kiov_t is used to describe page-based

	 * than LNET_MAX_IOV. The struct bio_vec is used to describe page-based

	 * fragments that are not necessarily mapped in virtual memory.

	 * - LNET_MD_IOVEC bit set: The start field points to the starting

	 * address of an array of struct iovec and the length field specifies
@@ -444,7 +444,7 @@ struct lnet_md { 
	 *   acknowledgment. Acknowledgments are never sent for GET operations.

	 *   The data sent in the REPLY serves as an implicit acknowledgment.

	 * - LNET_MD_KIOV: The start and length fields specify an array of

	 *   lnet_kiov_t.

	 *   struct bio_vec.

	 * - LNET_MD_IOVEC: The start and length fields specify an array of

	 *   struct iovec.

	 * - LNET_MD_MAX_SIZE: The max_size field is valid.
@@ -510,7 +510,6 @@ struct lnet_md { 
/** Infinite threshold on MD operations. See lnet_md::threshold */

#define LNET_MD_THRESH_INF	(-1)



typedef struct bio_vec lnet_kiov_t;

/** @} lnet_md */



/** \addtogroup lnet_eq

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+3 −3
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ kiblnd_setup_rd_iov(struct lnet_ni *ni, struct kib_tx *tx, 
static int

kiblnd_setup_rd_kiov(struct lnet_ni *ni, struct kib_tx *tx,

		     struct kib_rdma_desc *rd, int nkiov,

		     const lnet_kiov_t *kiov, int offset, int nob)

		     const struct bio_vec *kiov, int offset, int nob)

{

	struct kib_net *net = ni->ni_data;

	struct scatterlist *sg;
@@ -1487,7 +1487,7 @@ kiblnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg) 
	int routing = lntmsg->msg_routing;

	unsigned int payload_niov = lntmsg->msg_niov;

	struct kvec *payload_iov = lntmsg->msg_iov;

	lnet_kiov_t *payload_kiov = lntmsg->msg_kiov;

	struct bio_vec *payload_kiov = lntmsg->msg_kiov;

	unsigned int payload_offset = lntmsg->msg_offset;

	unsigned int payload_nob = lntmsg->msg_len;

	struct iov_iter from;
@@ -1656,7 +1656,7 @@ kiblnd_reply(struct lnet_ni *ni, struct kib_rx *rx, struct lnet_msg *lntmsg) 
	struct lnet_process_id target = lntmsg->msg_target;

	unsigned int niov = lntmsg->msg_niov;

	struct kvec *iov = lntmsg->msg_iov;

	lnet_kiov_t *kiov = lntmsg->msg_kiov;

	struct bio_vec *kiov = lntmsg->msg_kiov;

	unsigned int offset = lntmsg->msg_offset;

	unsigned int nob = lntmsg->msg_len;

	struct kib_tx *tx;

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

+6 −6
Original line number Diff line number Diff line
@@ -256,11 +256,11 @@ struct ksock_nal_data { 
/*

 * A packet just assembled for transmission is represented by 1 or more

 * struct iovec fragments (the first frag contains the portals header),

 * followed by 0 or more lnet_kiov_t fragments.

 * followed by 0 or more struct bio_vec fragments.

 *

 * On the receive side, initially 1 struct iovec fragment is posted for

 * receive (the header).  Once the header has been received, the payload is

 * received into either struct iovec or lnet_kiov_t fragments, depending on

 * received into either struct iovec or struct bio_vec fragments, depending on

 * what the header matched or whether the message needs forwarding.

 */

struct ksock_conn;  /* forward ref */
@@ -282,7 +282,7 @@ struct ksock_tx { /* transmit packet */ 
	unsigned short    tx_zc_capable:1; /* payload is large enough for ZC */

	unsigned short    tx_zc_checked:1; /* Have I checked if I should ZC? */

	unsigned short    tx_nonblk:1;     /* it's a non-blocking ACK */

	lnet_kiov_t       *tx_kiov;        /* packet page frags */

	struct bio_vec	  *tx_kiov;	   /* packet page frags */

	struct ksock_conn *tx_conn;        /* owning conn */

	struct lnet_msg        *tx_lnetmsg;     /* lnet message for lnet_finalize()

					    */
@@ -292,7 +292,7 @@ struct ksock_tx { /* transmit packet */ 
	union {

		struct {

			struct kvec iov;     /* virt hdr */

			lnet_kiov_t kiov[0]; /* paged payload */

			struct bio_vec kiov[0]; /* paged payload */

		} paged;

		struct {

			struct kvec iov[1];  /* virt hdr + payload */
@@ -310,7 +310,7 @@ struct ksock_tx { /* transmit packet */ 
 */

union ksock_rxiovspace {

	struct kvec      iov[LNET_MAX_IOV];

	lnet_kiov_t      kiov[LNET_MAX_IOV];

	struct bio_vec	kiov[LNET_MAX_IOV];

};



#define SOCKNAL_RX_KSM_HEADER   1 /* reading ksock message header */
@@ -362,7 +362,7 @@ struct ksock_conn { 
	int                ksnc_rx_niov;      /* # iovec frags */

	struct kvec        *ksnc_rx_iov;      /* the iovec frags */

	int                ksnc_rx_nkiov;     /* # page frags */

	lnet_kiov_t        *ksnc_rx_kiov;     /* the page frags */

	struct bio_vec		*ksnc_rx_kiov;	/* the page frags */

	union ksock_rxiovspace ksnc_rx_iov_space; /* space for frag descriptors */

	__u32              ksnc_rx_csum;      /* partial checksum for incoming

					       * data