From: wang di Date: Thu, 16 May 2013 07:00:06 +0000 (-0700) Subject: LU-3318 llite: Always build 64bit ino internally X-Git-Tag: 2.4.51~87 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cf775525f5fa8c96d073809a6afc4af0643dda9a;hp=d7b109d598674dcd7c654ca0fe06368d52eaeb3b LU-3318 llite: Always build 64bit ino internally Always build 64bit ino internally except the client is mounted with "32bitapi" option, so client will always use 64bit ino internally. It will build 32bit ino, only if application requires 32 bit ino. Signed-off-by: wang di Change-Id: I717e0551a7df4f8a7f02168702d8c9c58ecafd3d Reviewed-on: http://review.whamcloud.com/6371 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Ned Bass Reviewed-by: Fan Yong --- diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index a1a2408..01ddfd2 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -529,7 +529,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, LASSERT(fid_is_sane(&sbi->ll_root_fid)); root = ll_iget(sb, cl_fid_build_ino(&sbi->ll_root_fid, - ll_need_32bit_api(sbi)), + sbi->ll_flags & LL_SBI_32BIT_API), &lmd); md_free_lustre_md(sbi->ll_md_exp, &lmd); ptlrpc_req_finished(request); @@ -1739,7 +1739,8 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md) spin_unlock(&lli->lli_lock); } #endif - inode->i_ino = cl_fid_build_ino(&body->fid1, ll_need_32bit_api(sbi)); + inode->i_ino = cl_fid_build_ino(&body->fid1, + sbi->ll_flags & LL_SBI_32BIT_API); inode->i_generation = cl_fid_build_gen(&body->fid1); if (body->valid & OBD_MD_FLATIME) { @@ -2168,7 +2169,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req, LASSERT(fid_is_sane(&md.body->fid1)); *inode = ll_iget(sb, cl_fid_build_ino(&md.body->fid1, - ll_need_32bit_api(sbi)), + sbi->ll_flags & LL_SBI_32BIT_API), &md); if (*inode == NULL || IS_ERR(*inode)) { #ifdef CONFIG_FS_POSIX_ACL