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

Commit 03766dca authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

lustre: constify lib-move.c stuff 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4822848

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

+14 −14
Original line number Diff line number Diff line
@@ -605,34 +605,34 @@ void lnet_counters_reset(void); 


unsigned int lnet_iov_nob(unsigned int niov, struct kvec *iov);

int lnet_extract_iov(int dst_niov, struct kvec *dst,

		     int src_niov, struct kvec *src,

		     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, lnet_kiov_t *src,

		      int src_niov, const lnet_kiov_t *src,

		      unsigned int offset, unsigned int len);



void lnet_copy_iov2iov(unsigned int ndiov, struct kvec *diov,

void lnet_copy_iov2iov(unsigned int ndiov, const struct kvec *diov,

		       unsigned int doffset,

			unsigned int nsiov, struct kvec *siov,

			unsigned int nsiov, const struct kvec *siov,

			unsigned int soffset, unsigned int nob);

void lnet_copy_kiov2iov(unsigned int niov, struct kvec *iov,

void lnet_copy_kiov2iov(unsigned int niov, const struct kvec *iov,

			unsigned int iovoffset,

			 unsigned int nkiov, lnet_kiov_t *kiov,

			 unsigned int nkiov, const lnet_kiov_t *kiov,

			 unsigned int kiovoffset, unsigned int nob);

void lnet_copy_iov2kiov(unsigned int nkiov, lnet_kiov_t *kiov,

void lnet_copy_iov2kiov(unsigned int nkiov, const lnet_kiov_t *kiov,

			unsigned int kiovoffset,

			 unsigned int niov, struct kvec *iov,

			 unsigned int niov, const struct kvec *iov,

			 unsigned int iovoffset, unsigned int nob);

void lnet_copy_kiov2kiov(unsigned int ndkiov, lnet_kiov_t *dkiov,

void lnet_copy_kiov2kiov(unsigned int ndkiov, const lnet_kiov_t *dkiov,

			 unsigned int doffset,

			  unsigned int nskiov, lnet_kiov_t *skiov,

			  unsigned int nskiov, const lnet_kiov_t *skiov,

			  unsigned int soffset, unsigned int nob);



static inline void

lnet_copy_iov2flat(int dlen, void *dest, unsigned int doffset,

		   unsigned int nsiov, struct kvec *siov, unsigned int soffset,

		   unsigned int nsiov, const struct kvec *siov, unsigned int soffset,

		   unsigned int nob)

{

	struct kvec diov = {/*.iov_base = */ dest, /*.iov_len = */ dlen};
@@ -643,7 +643,7 @@ lnet_copy_iov2flat(int dlen, void *dest, unsigned int doffset, 


static inline void

lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset,

		    unsigned int nsiov, lnet_kiov_t *skiov,

		    unsigned int nsiov, const lnet_kiov_t *skiov,

		    unsigned int soffset, unsigned int nob)

{

	struct kvec diov = {/* .iov_base = */ dest, /* .iov_len = */ dlen};
@@ -653,7 +653,7 @@ lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset, 
}



static inline void

lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset,

lnet_copy_flat2iov(unsigned int ndiov, const struct kvec *diov, unsigned int doffset,

		   int slen, void *src, unsigned int soffset, unsigned int nob)

{

	struct kvec siov = {/*.iov_base = */ src, /*.iov_len = */slen};
@@ -663,7 +663,7 @@ lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset, 
}



static inline void

lnet_copy_flat2kiov(unsigned int ndiov, lnet_kiov_t *dkiov,

lnet_copy_flat2kiov(unsigned int ndiov, const lnet_kiov_t *dkiov,

		    unsigned int doffset, int slen, void *src,

		    unsigned int soffset, unsigned int nob)

{

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

+10 −10
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ lnet_iov_nob(unsigned int niov, struct kvec *iov) 
EXPORT_SYMBOL(lnet_iov_nob);



void

lnet_copy_iov2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset,

		  unsigned int nsiov, struct kvec *siov, unsigned int soffset,

lnet_copy_iov2iov(unsigned int ndiov, const struct kvec *diov, unsigned int doffset,

		  unsigned int nsiov, const struct kvec *siov, unsigned int soffset,

		  unsigned int nob)

{

	/* NB diov, siov are READ-ONLY */
@@ -226,7 +226,7 @@ EXPORT_SYMBOL(lnet_copy_iov2iov); 


int

lnet_extract_iov(int dst_niov, struct kvec *dst,

		 int src_niov, struct kvec *src,

		 int src_niov, const struct kvec *src,

		 unsigned int offset, unsigned int len)

{

	/*
@@ -287,8 +287,8 @@ lnet_kiov_nob(unsigned int niov, lnet_kiov_t *kiov) 
EXPORT_SYMBOL(lnet_kiov_nob);



void

lnet_copy_kiov2kiov(unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset,

		    unsigned int nsiov, lnet_kiov_t *siov, unsigned int soffset,

lnet_copy_kiov2kiov(unsigned int ndiov, const lnet_kiov_t *diov, unsigned int doffset,

		    unsigned int nsiov, const lnet_kiov_t *siov, unsigned int soffset,

		    unsigned int nob)

{

	/* NB diov, siov are READ-ONLY */
@@ -370,8 +370,8 @@ lnet_copy_kiov2kiov(unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset, 
EXPORT_SYMBOL(lnet_copy_kiov2kiov);



void

lnet_copy_kiov2iov(unsigned int niov, struct kvec *iov, unsigned int iovoffset,

		   unsigned int nkiov, lnet_kiov_t *kiov,

lnet_copy_kiov2iov(unsigned int niov, const struct kvec *iov, unsigned int iovoffset,

		   unsigned int nkiov, const lnet_kiov_t *kiov,

		   unsigned int kiovoffset, unsigned int nob)

{

	/* NB iov, kiov are READ-ONLY */
@@ -440,9 +440,9 @@ lnet_copy_kiov2iov(unsigned int niov, struct kvec *iov, unsigned int iovoffset, 
EXPORT_SYMBOL(lnet_copy_kiov2iov);



void

lnet_copy_iov2kiov(unsigned int nkiov, lnet_kiov_t *kiov,

lnet_copy_iov2kiov(unsigned int nkiov, const lnet_kiov_t *kiov,

		   unsigned int kiovoffset, unsigned int niov,

		   struct kvec *iov, unsigned int iovoffset,

		   const struct kvec *iov, unsigned int iovoffset,

		   unsigned int nob)

{

	/* NB kiov, iov are READ-ONLY */
@@ -511,7 +511,7 @@ EXPORT_SYMBOL(lnet_copy_iov2kiov); 


int

lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,

		  int src_niov, lnet_kiov_t *src,

		  int src_niov, const lnet_kiov_t *src,

		  unsigned int offset, unsigned int len)

{

	/*