evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/lustre: remove linux/lustre_common.h

Browse source 
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>
This commit is contained in:
John L. Hammond 2014-09-09 13:39:03 -05:00 • committed by Greg Kroah-Hartman
parent fdedd94509
commit 16e0631db7
5 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/staging/lustre/lustre/include/linux/lustre_common.h
View file

@ -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

1
drivers/staging/lustre/lustre/include/linux/lustre_lite.h
View file

@ -52,7 +52,6 @@
#include <linux/rbtree.h>
#include "../../include/linux/lustre_compat25.h"
#include "../../include/linux/lustre_common.h"
#include <linux/pagemap.h>
/* lprocfs.c */

1
drivers/staging/lustre/lustre/include/linux/lvfs.h
View file

@ -46,7 +46,6 @@
#endif
#include "lustre_compat25.h"
#include "lustre_common.h"
#include "lvfs_linux.h"
#define LLOG_LVFS

2
drivers/staging/lustre/lustre/llite/file.c
View file

@ -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;

2
drivers/staging/lustre/lustre/obdclass/obdo.c
View file

@ -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) {