From: John L. Hammond Date: Tue, 9 Sep 2014 18:39:03 +0000 (-0500) Subject: staging/lustre: remove linux/lustre_common.h X-Git-Tag: fixes-for-v3.18-merge-window~15^2~467 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e0631db72cf70e6be1abb8892ec2928a16f716;p=pandora-kernel.git 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 --- 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 Reading git-diff-tree failed