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

Commit 307bef74 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: pass struct md_op_data to ll_dir_read 



Add struct md_op_data as a parameter to ll_dir_read.

Signed-off-by: default avatarwang di <di.wang@intel.com>
Reviewed-on: http://review.whamcloud.com/7043
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3531


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 969d25d4

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

+12 −2
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ static __u16 ll_dirent_type_get(struct lu_dirent *ent) 
	return type;

}



int ll_dir_read(struct inode *inode, struct dir_context *ctx)

int ll_dir_read(struct inode *inode, struct md_op_data *op_data,

		struct dir_context *ctx)

{

	struct ll_inode_info *info       = ll_i2info(inode);

	struct ll_sb_info    *sbi	= ll_i2sbi(inode);
@@ -613,6 +614,7 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx) 
	__u64 pos = lfd ? lfd->lfd_pos : 0;

	int			hash64	= sbi->ll_flags & LL_SBI_64BIT_HASH;

	int			api32	= ll_need_32bit_api(sbi);

	struct md_op_data *op_data;

	int			rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p) pos/size %lu/%llu 32bit_api %d\n",
@@ -627,8 +629,15 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx) 
		goto out;

	}



	op_data = ll_prep_md_op_data(NULL, inode, inode, NULL, 0, 0,

				     LUSTRE_OPC_ANY, inode);

	if (IS_ERR(op_data)) {

		rc = PTR_ERR(op_data);

		goto out;

	}



	ctx->pos = pos;

	rc = ll_dir_read(inode, ctx);

	rc = ll_dir_read(inode, op_data, ctx);

	if (lfd)

		lfd->lfd_pos = ctx->pos;

	if (ctx->pos == MDS_DIR_END_OFF) {
@@ -640,6 +649,7 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx) 
		if (api32 && hash64)

			ctx->pos >>= 32;

	}

	ll_finish_md_op_data(op_data);

	filp->f_version = inode->i_version;



out:

drivers/staging/lustre/lustre/llite/llite_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ extern const struct file_operations ll_dir_operations; 
extern const struct inode_operations ll_dir_inode_operations;

struct page *ll_get_dir_page(struct inode *dir, __u64 hash,

			     struct ll_dir_chain *chain);

int ll_dir_read(struct inode *inode, struct dir_context *ctx);

int ll_dir_read(struct inode *inode, struct md_op_data *op_data,

		struct dir_context *ctx);



int ll_get_mdt_idx(struct inode *inode);

/* llite/namei.c */

drivers/staging/lustre/lustre/llite/llite_nfs.c

+10 −1
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ static int ll_get_name(struct dentry *dentry, char *name, 
		.lgd_fid = ll_i2info(d_inode(child))->lli_fid,

		.ctx.actor = ll_nfs_get_name_filldir,

	};

	struct md_op_data *op_data;



	if (!dir || !S_ISDIR(dir->i_mode)) {

		rc = -ENOTDIR;
@@ -266,9 +267,17 @@ static int ll_get_name(struct dentry *dentry, char *name, 
		goto out;

	}



	op_data = ll_prep_md_op_data(NULL, dir, dir, NULL, 0, 0,

				     LUSTRE_OPC_ANY, dir);

	if (IS_ERR(op_data)) {

		rc = PTR_ERR(op_data);

		goto out;

	}



	inode_lock(dir);

	rc = ll_dir_read(dir, &lgd.ctx);

	rc = ll_dir_read(dir, op_data, &lgd.ctx);

	inode_unlock(dir);

	ll_finish_md_op_data(op_data);

	if (!rc && !lgd.lgd_found)

		rc = -ENOENT;

out:

drivers/staging/lustre/lustre/llite/statahead.c

+7 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,7 @@ static int ll_statahead_thread(void *arg) 
	__u64		     pos    = 0;

	int		       first  = 0;

	int		       rc     = 0;

	struct md_op_data *op_data;

	struct ll_dir_chain       chain;

	struct l_wait_info	lwi    = { 0 };
@@ -1046,6 +1047,11 @@ static int ll_statahead_thread(void *arg) 
	CDEBUG(D_READA, "statahead thread starting: sai %p, parent %pd\n",

	       sai, parent);



	op_data = ll_prep_md_op_data(NULL, dir, dir, NULL, 0, 0,

				     LUSTRE_OPC_ANY, dir);

	if (IS_ERR(op_data))

		return PTR_ERR(op_data);



	if (sbi->ll_flags & LL_SBI_AGL_ENABLED)

		ll_start_agl(parent, sai);
@@ -1236,6 +1242,7 @@ static int ll_statahead_thread(void *arg) 
	}



out:

	ll_finish_md_op_data(op_data);

	if (sai->sai_agl_valid) {

		spin_lock(&plli->lli_agl_lock);

		thread_set_flags(agl_thread, SVC_STOPPING);