From 37807874074d8f9451fea93db4419863fa1fe56f Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Mon, 18 Aug 2014 11:43:31 -0500 Subject: [PATCH] LU-2675 lustre: remove linux/lustre_common.h Remove lustre/include/linux/lustre_common.h and several unnecessary calls to cfs_cleanup_group_info(). Signed-off-by: John L. Hammond Change-Id: I149673dea6559b02a5de1c0a160836d67ea96119 Reviewed-on: http://review.whamcloud.com/11495 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/include/linux/Makefile.am | 2 +- lustre/include/linux/lustre_common.h | 22 ---------------------- lustre/include/linux/lustre_lib.h | 1 - lustre/include/linux/lustre_lite.h | 1 - lustre/include/linux/lvfs.h | 1 - lustre/include/linux/obd_support.h | 1 - lustre/llite/file.c | 2 +- lustre/mgc/mgc_request.c | 2 -- lustre/mgs/mgs_fs.c | 5 ----- lustre/obdclass/obdo.c | 2 +- lustre/ost/ost_handler.c | 4 ---- 11 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 lustre/include/linux/lustre_common.h diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am index 9aa59f9..b0e311d 100644 --- a/lustre/include/linux/Makefile.am +++ b/lustre/include/linux/Makefile.am @@ -45,4 +45,4 @@ endif EXTRA_DIST = lustre_debug.h lustre_lib.h \ lustre_dlm.h lustre_handles.h lustre_net.h obd_class.h obd_support.h \ obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \ - lustre_user.h lustre_patchless_compat.h lustre_intent.h lustre_common.h + lustre_user.h lustre_patchless_compat.h lustre_intent.h diff --git a/lustre/include/linux/lustre_common.h b/lustre/include/linux/lustre_common.h deleted file mode 100644 index d1783a3..0000000 --- a/lustre/include/linux/lustre_common.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef LUSTRE_COMMON_H -#define LUSTRE_COMMON_H - -#include - -static inline int cfs_cleanup_group_info(void) -{ - struct group_info *ginfo; - - ginfo = groups_alloc(0); - if (!ginfo) - return -ENOMEM; - - set_current_groups(ginfo); - put_group_info(ginfo); - - return 0; -} - -#define ll_inode_blksize(a) (1<<(a)->i_blkbits) - -#endif diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h index 6a09018..f5680fe 100644 --- a/lustre/include/linux/lustre_lib.h +++ b/lustre/include/linux/lustre_lib.h @@ -50,7 +50,6 @@ #include #include #include -#include #ifndef LP_POISON #if BITS_PER_LONG > 32 diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h index 6978c24..ad254b7 100644 --- a/lustre/include/linux/lustre_lite.h +++ b/lustre/include/linux/lustre_lite.h @@ -49,7 +49,6 @@ #include #include #include -#include #include /* lprocfs.c */ diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h index d240ac4..8e7405d 100644 --- a/lustre/include/linux/lvfs.h +++ b/lustre/include/linux/lvfs.h @@ -46,7 +46,6 @@ #endif #include -#include #include #define OBD_RUN_CTXT_MAGIC 0xC0FFEEAA diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h index bc85713..52d3470 100644 --- a/lustre/include/linux/obd_support.h +++ b/lustre/include/linux/obd_support.h @@ -52,7 +52,6 @@ #include #include #include -#include #endif #include #include diff --git a/lustre/llite/file.c b/lustre/llite/file.c index b29a9c6..a17ae91 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -1024,7 +1024,7 @@ int ll_inode_getattr(struct inode *inode, struct obdo *obdo, CDEBUG(D_INODE, "objid "DOSTID" size %llu, blocks %llu," " blksize %lu\n", POSTID(oi), i_size_read(inode), (unsigned long long)inode->i_blocks, - (unsigned long)ll_inode_blksize(inode)); + 1UL << inode->i_blkbits); } ccc_inode_lsm_put(inode, lsm); RETURN(rc); diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 09f9952..6160ffb 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -711,8 +711,6 @@ static int mgc_fs_setup(struct obd_device *obd, struct super_block *sb) /* The mgc fs exclusion mutex. Only one fs can be setup at a time. */ mutex_lock(&cli->cl_mgc_mutex); - cfs_cleanup_group_info(); - /* Setup the configs dir */ rc = lu_env_init(env, LCT_MG_THREAD); if (rc) diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 5d2b99b..e5c1d6c 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -113,11 +113,6 @@ int mgs_fs_setup(const struct lu_env *env, struct mgs_device *mgs) ENTRY; - /* FIXME what's this? Do I need it? */ - rc = cfs_cleanup_group_info(); - if (rc) - RETURN(rc); - OBD_SET_CTXT_MAGIC(&mgs->mgs_obd->obd_lvfs_ctxt); mgs->mgs_obd->obd_lvfs_ctxt.dt = mgs->mgs_bottom; diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c index 4ac18b4..767cf74 100644 --- a/lustre/obdclass/obdo.c +++ b/lustre/obdclass/obdo.c @@ -86,7 +86,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid) newvalid |= OBD_MD_FLBLOCKS; } if (valid & OBD_MD_FLBLKSZ) { /* optimal block size */ - dst->o_blksize = ll_inode_blksize(src); + dst->o_blksize = 1U << src->i_blkbits; newvalid |= OBD_MD_FLBLKSZ; } if (valid & OBD_MD_FLTYPE) { diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index bae0a40..46cbe77 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -90,10 +90,6 @@ static int ost_setup(struct obd_device *obd, struct lustre_cfg* lcfg) int rc; ENTRY; - rc = cfs_cleanup_group_info(); - if (rc) - RETURN(rc); - #ifdef LPROCFS obd->obd_vars = lprocfs_ost_obd_vars; lprocfs_seq_obd_setup(obd); -- 1.8.3.1