iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/lustre/lov: remove a bit of dead code

Browse Source 
lov_stripe_md_cmp lov_lum_lsm_cmp lov_lum_swab_if_needed functions
have not been in used for a long time, so lets just remove them.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2015-09-27 16:45:32 -04:00 committed by Greg Kroah-Hartman
parent 380f01a18c
commit 806d6514e9
1 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/staging/lustre/lustre/include/obd.h
View File

@ -167,68 +167,6 @@ struct obd_info {
void *oi_capa;
};
/* compare all relevant fields. */
static inline int lov_stripe_md_cmp(struct lov_stripe_md *m1,
struct lov_stripe_md *m2)
{
/*
* ->lsm_wire contains padding, but it should be zeroed out during
* allocation.
*/
return memcmp(&m1->lsm_wire, &m2->lsm_wire, sizeof(m1->lsm_wire));
}
static inline int lov_lum_lsm_cmp(struct lov_user_md *lum,
struct lov_stripe_md *lsm)
{
if (lsm->lsm_magic != lum->lmm_magic)
return 1;
if ((lsm->lsm_stripe_count != 0) && (lum->lmm_stripe_count != 0) &&
(lsm->lsm_stripe_count != lum->lmm_stripe_count))
return 2;
if ((lsm->lsm_stripe_size != 0) && (lum->lmm_stripe_size != 0) &&
(lsm->lsm_stripe_size != lum->lmm_stripe_size))
return 3;
if ((lsm->lsm_pattern != 0) && (lum->lmm_pattern != 0) &&
(lsm->lsm_pattern != lum->lmm_pattern))
return 4;
if ((lsm->lsm_magic == LOV_MAGIC_V3) &&
(strncmp(lsm->lsm_pool_name,
((struct lov_user_md_v3 *)lum)->lmm_pool_name,
LOV_MAXPOOLNAME) != 0))
return 5;
return 0;
}
static inline int lov_lum_swab_if_needed(struct lov_user_md_v3 *lumv3,
int *lmm_magic,
struct lov_user_md *lum)
{
if (lum && copy_from_user(lumv3, lum, sizeof(struct lov_user_md_v1)))
return -EFAULT;
*lmm_magic = lumv3->lmm_magic;
if (*lmm_magic == __swab32(LOV_USER_MAGIC_V1)) {
lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lumv3);
*lmm_magic = LOV_USER_MAGIC_V1;
} else if (*lmm_magic == LOV_USER_MAGIC_V3) {
if (lum && copy_from_user(lumv3, lum, sizeof(*lumv3)))
return -EFAULT;
} else if (*lmm_magic == __swab32(LOV_USER_MAGIC_V3)) {
if (lum && copy_from_user(lumv3, lum, sizeof(*lumv3)))
return -EFAULT;
lustre_swab_lov_user_md_v3(lumv3);
*lmm_magic = LOV_USER_MAGIC_V3;
} else if (*lmm_magic != LOV_USER_MAGIC_V1) {
CDEBUG(D_IOCTL,
"bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",
*lmm_magic, LOV_USER_MAGIC_V1, LOV_USER_MAGIC_V3);
return -EINVAL;
}
return 0;
}
void lov_stripe_lock(struct lov_stripe_md *md);
void lov_stripe_unlock(struct lov_stripe_md *md);