xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/lustre/llite: Move ll_dirent_type_get and make it static

Browse Source 
ll_dirent_type_get is only used in one place in llite/dir.c,
so move it there.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin
2016-03-30 19:48:59 -04:00
committed by Greg Kroah-Hartman
parent a37bec74c4
commit 0097dcabe6
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/lustre/lustre/llite/dir.c
View File

@@ -469,6 +469,28 @@ fail:
goto out_unlock; goto out_unlock;
} }
/**
* return IF_* type for given lu_dirent entry.
* IF_* flag shld be converted to particular OS file type in
* platform llite module.
*/
static __u16 ll_dirent_type_get(struct lu_dirent *ent)
{
__u16 type = 0;
struct luda_type *lt;
int len = 0;
if (le32_to_cpu(ent->lde_attrs) & LUDA_TYPE) {
const unsigned int align = sizeof(struct luda_type) - 1;
len = le16_to_cpu(ent->lde_namelen);
len = (len + align) & ~align;
lt = (void *)ent->lde_name + len;
type = IFTODT(le16_to_cpu(lt->lt_type));
}
return type;
}
int ll_dir_read(struct inode *inode, struct dir_context *ctx) int ll_dir_read(struct inode *inode, struct dir_context *ctx)
{ {
struct ll_inode_info *info = ll_i2info(inode); struct ll_inode_info *info = ll_i2info(inode);

22
drivers/staging/lustre/lustre/llite/lcommon_cl.c
View File

@@ -279,28 +279,6 @@ void cl_inode_fini(struct inode *inode)
} }
} }
/**
* return IF_* type for given lu_dirent entry.
* IF_* flag shld be converted to particular OS file type in
* platform llite module.
*/
__u16 ll_dirent_type_get(struct lu_dirent *ent)
{
__u16 type = 0;
struct luda_type *lt;
int len = 0;
if (le32_to_cpu(ent->lde_attrs) & LUDA_TYPE) {
const unsigned int align = sizeof(struct luda_type) - 1;
len = le16_to_cpu(ent->lde_namelen);
len = (len + align) & ~align;
lt = (void *)ent->lde_name + len;
type = IFTODT(le16_to_cpu(lt->lt_type));
}
return type;
}
/** /**
* build inode number from passed @fid * build inode number from passed @fid
*/ */

1
drivers/staging/lustre/lustre/llite/vvp_internal.h
View File

@@ -376,7 +376,6 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md);
void cl_inode_fini(struct inode *inode); void cl_inode_fini(struct inode *inode);
int cl_local_size(struct inode *inode); int cl_local_size(struct inode *inode);
__u16 ll_dirent_type_get(struct lu_dirent *ent);
__u64 cl_fid_build_ino(const struct lu_fid *fid, int api32); __u64 cl_fid_build_ino(const struct lu_fid *fid, int api32);
__u32 cl_fid_build_gen(const struct lu_fid *fid); __u32 cl_fid_build_gen(const struct lu_fid *fid);