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 <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/11495
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 (file)
index d1783a3..0000000
--- 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 <linux/sched.h>
-
-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 --cc drivers/staging/lustre/lustre/include/linux/lustre_lite.h
Simple merge

diff --cc drivers/staging/lustre/lustre/include/linux/lvfs.h
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/obdo.c
Simple merge