Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0097dcab authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a37bec74

drivers/staging/lustre/lustre/llite/dir.c

+22 −0
Original line number Diff line number Diff line
@@ -469,6 +469,28 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash, 
	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)

{

	struct ll_inode_info *info       = ll_i2info(inode);

drivers/staging/lustre/lustre/llite/lcommon_cl.c

+0 −22
Original line number Diff line number Diff line
@@ -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

 */

drivers/staging/lustre/lustre/llite/vvp_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md); 
void cl_inode_fini(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);

__u32 cl_fid_build_gen(const struct lu_fid *fid);