staging/lustre/libcfs: remove user space code from kernel_user_comm.c
PATCH 1/3 staging/lustre/libcfs: remove user space code from kernel_user_comm.c
Cc Andreas Dilger <[email protected]>
Cc Oleg Drokin <[email protected]>
Signed-off-by Peng Tao <[email protected]>
--- .../lustre/lustre/libcfs/kernel_user_comm.c | 102 -------------------- 1 files changed, 0 insertions(+), 102 deletions(-)
drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c +0 -102
@@ -44,106 +44,6 @@#include <linux/libcfs/libcfs.h> -#ifdef LUSTRE_UTILS -/* This is the userspace side. */ - -/** Start the userspace side of a KUC pipe. -* @param link Private descriptor for pipe/socket. -* @param groups KUC broadcast group to listen to -* (can be null for unicast to this pid) -*/ -int libcfs_ukuc_start (lustre_kernelcomm *link,int group) -{ -int pfd[2 ]; - -if (pipe (pfd) <0 ) -return -errno; - -memset (link,0 ,sizeof (*link)); - link->lk_rfd = pfd[0 ]; - link->lk_wfd = pfd[1 ]; - link->lk_group = group; - link->lk_uid =getpid (); -return 0 ; -} - -int libcfs_ukuc_stop (lustre_kernelcomm *link) -{ -if (link->lk_wfd >0 ) -close (link->lk_wfd); -return close (link->lk_rfd); -} - -#define lhsz sizeof(*kuch) - -/** Read a message from the link. -* Allocates memory, returns handle -* -* @param link Private descriptor for pipe/socket. -* @param buf Buffer to read into, must include size for kuc_hdr -* @param maxsize Maximum message size allowed -* @param transport Only listen to messages on this transport -* (and the generic transport) -*/ -int libcfs_ukuc_msg_get (lustre_kernelcomm *link,char *buf,int maxsize, -int transport) -{ -struct kuc_hdr *kuch; -int rc =0 ; - -memset (buf,0 , maxsize); - -CDEBUG (D_KUC ,"Waiting for message from kernel on fd %d\n" , - link->lk_rfd); - -while (1 ) { -/* Read header first to get message size */ - rc =read (link->lk_rfd, buf, lhsz); -if (rc <=0 ) { - rc = -errno; -break ; - } - kuch = (struct kuc_hdr *)buf; - -CDEBUG (D_KUC ,"Received message mg=%x t=%d m=%d l=%d\n" , - kuch->kuc_magic, kuch->kuc_transport, kuch->kuc_msgtype, - kuch->kuc_msglen); - -if (kuch->kuc_magic !=KUC_MAGIC ) { -CERROR ("bad message magic %x != %x\n" , - kuch->kuc_magic,KUC_MAGIC ); - rc = -EPROTO ; -break ; - } - -if (kuch->kuc_msglen > maxsize) { - rc = -EMSGSIZE ; -break ; - } - -/* Read payload */ - rc =read (link->lk_rfd, buf + lhsz, kuch->kuc_msglen - lhsz); -if (rc <0 ) { - rc = -errno; -break ; - } -if (rc < (kuch->kuc_msglen - lhsz)) { -CERROR ("short read: got %d of %d bytes\n" , - rc, kuch->kuc_msglen); - rc = -EPROTO ; -break ; - } - -if (kuch->kuc_transport == transport || - kuch->kuc_transport ==KUC_TRANSPORT_GENERIC ) { -return 0 ; - } -/* Drop messages for other transports */ - } -return rc; -} - -#else /* LUSTRE_UTILS */ /* This is the kernel side (liblustre as well). */ /**
@@ -338,5 +238,3 @@ int libcfs_kkuc_group_foreach(int group, libcfs_kkuc_cb_t cb_func,return rc; }EXPORT_SYMBOL (libcfs_kkuc_group_foreach); - -#endif /* LUSTRE_UTILS */
Signature · 1 line
1.7.7.6
PATCH 2/3 staging/lustre/libcfs: remove cfs_hash_long
Cc Andreas Dilger <[email protected]>
Cc Oleg Drokin <[email protected]>
Signed-off-by Peng Tao <[email protected]>
--- .../lustre/include/linux/libcfs/libcfs_hash.h | 2 -- .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +- drivers/staging/lustre/lnet/lnet/api-ni.c | 2 +- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 ++-- drivers/staging/lustre/lustre/obdclass/lu_object.c | 4 ++-- .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-)
drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h +0 -2
@@ -65,8 +65,6 @@#include <linux/hash.h> -#define cfs_hash_long (val, bits) hash_long(val, bits) -/** disable debug */ #define CFS_HASH_DEBUG_NONE 0/** record hash depth and output to console when it's too deep,
drivers/staging/lustre/include/linux/lnet/lib-lnet.h +1 -1
@@ -628,7 +628,7 @@ void lnet_ni_free(lnet_ni_t *ni);static inline int lnet_nid2peerhash (lnet_nid_t nid) { -return cfs_hash_long (nid,LNET_PEER_HASH_BITS ); +return hash_long (nid,LNET_PEER_HASH_BITS ); } static inline struct list_head *
drivers/staging/lustre/lnet/lnet/api-ni.c +1 -1
@@ -770,7 +770,7 @@ lnet_nid_cpt_hash(lnet_nid_t nid, unsigned int number)if (number ==1 )return 0 ; - val =cfs_hash_long (key,LNET_CPT_BITS ); + val =hash_long (key,LNET_CPT_BITS );/* NB: LNET_CP_NUMBER doesn't have to be PO2 */ if (val < number)return val;
drivers/staging/lustre/lnet/lnet/lib-ptl.c +1 -1
@@ -366,7 +366,7 @@ lnet_mt_match_head(struct lnet_match_table *mtable,unsigned long hash = mbits + id.nid + id.pid;LASSERT (lnet_ptl_is_unique (ptl)); - hash =cfs_hash_long (hash,LNET_MT_HASH_BITS ); + hash =hash_long (hash,LNET_MT_HASH_BITS );return &mtable->mt_mhash[hash]; } }
drivers/staging/lustre/lustre/include/lustre_fid.h +1 -1
@@ -685,7 +685,7 @@ static inline __u32 fid_hash(const struct lu_fid *f, int bits) {/* all objects with same id and different versions will belong to same * collisions list. */ -return cfs_hash_long (fid_flatten (f), bits); +return hash_long (fid_flatten (f), bits); }/**
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +2 -2
@@ -421,9 +421,9 @@ static unsigned ldlm_res_hop_fid_hash(struct cfs_hash *hs, }else { val =fid_oid (&fid); } - hash =cfs_hash_long (hash, hs->hs_bkt_bits); + hash =hash_long (hash, hs->hs_bkt_bits);/* give me another random factor */ - hash -=cfs_hash_long ((unsigned long )hs, val %11 +3 ); + hash -=hash_long ((unsigned long )hs, val %11 +3 ); hash <<= hs->hs_cur_bits - hs->hs_bkt_bits; hash |=ldlm_res_hop_hash (hs, key,CFS_HASH_NBKT (hs) -1 );
drivers/staging/lustre/lustre/obdclass/lu_object.c +2 -2
@@ -890,10 +890,10 @@ static unsigned lu_obj_hop_hash(struct cfs_hash *hs, hash =fid_flatten32 (fid); hash += (hash >>4 ) + (hash <<12 );/* mixing oid and seq */ - hash =cfs_hash_long (hash, hs->hs_bkt_bits); + hash =hash_long (hash, hs->hs_bkt_bits);/* give me another random factor */ - hash -=cfs_hash_long ((unsigned long )hs,fid_oid (fid) %11 +3 ); + hash -=hash_long ((unsigned long )hs,fid_oid (fid) %11 +3 ); hash <<= hs->hs_cur_bits - hs->hs_bkt_bits; hash |= (fid_seq (fid) +fid_oid (fid)) & (CFS_HASH_NBKT (hs) -1 );
drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c +1 -1
@@ -102,7 +102,7 @@ static inline unsigned long hash_mem(char *buf, int length, int bits) len++;if ((len & (BITS_PER_LONG /8 -1 )) ==0 ) - hash =cfs_hash_long (hash^l,BITS_PER_LONG ); + hash =hash_long (hash^l,BITS_PER_LONG ); }while (len);return hash >> (BITS_PER_LONG - bits);
Signature · 1 line
1.7.7.6
PATCH 3/3 staging/lustre: fix coccinelle warnings
From: Fengguang Wu <[email protected]>
drivers/staging/lustre/lustre/llite/dir.c:1416:2-8: Replace memcpy with struct assignment
Generated by: coccinelle/misc/memcpy-assign.cocci
CC Peng Tao <[email protected]>
CC Andreas Dilger <[email protected]>
CC Oleg Drokin <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
Signed-off-by Fengguang Wu <[email protected]>
--- drivers/staging/lustre/lustre/llite/dir.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/lustre/lustre/llite/dir.c +1 -1
@@ -1400,7 +1400,7 @@ lmv_out_free:if (tmp ==NULL )GOTO (free_lmv, rc = -ENOMEM ); -memcpy (tmp, &lum,sizeof (lum)); + *tmp = lum; tmp->lum_type =LMV_STRIPE_TYPE ; tmp->lum_stripe_count =1 ; mdtindex =ll_get_mdt_idx (inode);
Signature · 1 line
1.7.7.6