From 16e0631db72cf70e6be1abb8892ec2928a16f716 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Tue, 9 Sep 2014 13:39:03 -0500 Subject: [PATCH] staging/lustre: remove linux/lustre_common.h Expand the two uses of ll_inode_blksize() and remove the then unnecessary header lustre/include/linux/lustre_common.h. Signed-off-by: John L. Hammond Reviewed-on: http://review.whamcloud.com/11495 Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- .../lustre/include/linux/lustre_common.h | 22 ------------------- .../lustre/lustre/include/linux/lustre_lite.h | 1 - .../lustre/lustre/include/linux/lvfs.h | 1 - drivers/staging/lustre/lustre/llite/file.c | 2 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 2 +- 5 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_common.h diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_common.h b/drivers/staging/lustre/lustre/include/linux/lustre_common.h deleted file mode 100644 index d1783a33d8ca..000000000000 --- a/drivers/staging/lustre/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/drivers/staging/lustre/lustre/include/linux/lustre_lite.h b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h index 99eed4987635..a7658a99a08d 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_lite.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h @@ -52,7 +52,6 @@ #include #include "../../include/linux/lustre_compat25.h" -#include "../../include/linux/lustre_common.h" #include /* lprocfs.c */ diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs.h b/drivers/staging/lustre/lustre/include/linux/lvfs.h index c446375314a8..e4cdb45028f4 100644 --- a/drivers/staging/lustre/lustre/include/linux/lvfs.h +++ b/drivers/staging/lustre/lustre/include/linux/lvfs.h @@ -46,7 +46,6 @@ #endif #include "lustre_compat25.h" -#include "lustre_common.h" #include "lvfs_linux.h" #define LLOG_LVFS diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index bc68fddc4c63..3c6fb4a82fb6 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -991,7 +991,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/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c index d170b149af0e..b97433e9bcbd 100644 --- a/drivers/staging/lustre/lustre/obdclass/obdo.c +++ b/drivers/staging/lustre/lustre/obdclass/obdo.c @@ -86,7 +86,7 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, u32 valid) newvalid |= OBD_MD_FLBLOCKS; } if (valid & OBD_MD_FLBLKSZ) { /* optimal block size */ - dst->o_blksize = ll_inode_blksize(src); + dst->o_blksize = 1 << src->i_blkbits; newvalid |= OBD_MD_FLBLKSZ; } if (valid & OBD_MD_FLTYPE) { -- 2.39.2