Commit a33fdc0d authored by Bobi Jam's avatar Bobi Jam Committed by Greg Kroah-Hartman
Browse files

staging: lustre: clio: add coo_getstripe interface 



Use cl_object_operations::coo_getstripe() to handle
LL_IOC_LOV_GETSTRIPE ops.

Signed-off-by: default avatarBobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5823
Reviewed-on: http://review.whamcloud.com/12452


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@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 fdeb14fa

drivers/staging/lustre/lustre/include/cl_object.h

+7 −0
Original line number Diff line number Diff line
@@ -395,6 +395,11 @@ struct cl_object_operations { 
	 * mainly pages and locks.

	 */

	int (*coo_prune)(const struct lu_env *env, struct cl_object *obj);

	/**

	 * Object getstripe method.

	 */

	int (*coo_getstripe)(const struct lu_env *env, struct cl_object *obj,

			     struct lov_user_md __user *lum);

};



/**
@@ -2174,6 +2179,8 @@ int cl_conf_set(const struct lu_env *env, struct cl_object *obj, 
		 const struct cl_object_conf *conf);

int cl_object_prune(const struct lu_env *env, struct cl_object *obj);

void cl_object_kill(const struct lu_env *env, struct cl_object *obj);

int  cl_object_getstripe(const struct lu_env *env, struct cl_object *obj,

			 struct lov_user_md __user *lum);



/**

 * Returns true, iff \a o0 and \a o1 are slices of the same object.

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

+19 −19
Original line number Diff line number Diff line
@@ -1449,6 +1449,22 @@ static int ll_lov_setea(struct inode *inode, struct file *file, 
	return rc;

}



static int ll_file_getstripe(struct inode *inode,

			     struct lov_user_md __user *lum)

{

	struct lu_env *env;

	int refcheck;

	int rc;



	env = cl_env_get(&refcheck);

	if (IS_ERR(env))

		return PTR_ERR(env);



	rc = cl_object_getstripe(env, ll_i2info(inode)->lli_clob, lum);

	cl_env_put(env, &refcheck);

	return rc;

}



static int ll_lov_setstripe(struct inode *inode, struct file *file,

			    unsigned long arg)

{
@@ -1466,35 +1482,18 @@ static int ll_lov_setstripe(struct inode *inode, struct file *file, 
				      lum_size);

	cl_lov_delay_create_clear(&file->f_flags);

	if (rc == 0) {

		struct lov_stripe_md *lsm;

		__u32 gen;



		put_user(0, &lum->lmm_stripe_count);



		ll_layout_refresh(inode, &gen);

		lsm = ccc_inode_lsm_get(inode);

		rc = obd_iocontrol(LL_IOC_LOV_GETSTRIPE, ll_i2dtexp(inode),

				   0, lsm, lum);

		ccc_inode_lsm_put(inode, lsm);

		rc = ll_file_getstripe(inode, (struct lov_user_md __user *)arg);

	}



	kfree(klum);

	return rc;

}



static int ll_lov_getstripe(struct inode *inode, unsigned long arg)

{

	struct lov_stripe_md *lsm;

	int rc = -ENODATA;



	lsm = ccc_inode_lsm_get(inode);

	if (lsm)

		rc = obd_iocontrol(LL_IOC_LOV_GETSTRIPE, ll_i2dtexp(inode), 0,

				   lsm, (void __user *)arg);

	ccc_inode_lsm_put(inode, lsm);

	return rc;

}



static int

ll_get_grouplock(struct inode *inode, struct file *file, unsigned long arg)

{
@@ -2233,7 +2232,8 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return rc;

	}

	case LL_IOC_LOV_GETSTRIPE:

		return ll_lov_getstripe(inode, arg);

		return ll_file_getstripe(inode,

					 (struct lov_user_md __user *)arg);

	case FSFILT_IOC_FIEMAP:

		return ll_ioctl_fiemap(inode, arg);

	case FSFILT_IOC_GETFLAGS:

drivers/staging/lustre/lustre/lov/lov_cl_internal.h

+6 −0
Original line number Diff line number Diff line
@@ -556,6 +556,8 @@ struct lov_lock_link *lov_lock_link_find(const struct lu_env *env, 
					 struct lovsub_lock *sub);

struct lov_io_sub *lov_page_subio(const struct lu_env *env, struct lov_io *lio,

				  const struct cl_page_slice *slice);



struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov);

int lov_page_stripe(const struct cl_page *page);



#define lov_foreach_target(lov, var)		    \
@@ -747,6 +749,10 @@ static inline struct lov_layout_raid0 *lov_r0(struct lov_object *lov) 
	return &lov->u.raid0;

}



/* lov_pack.c */

int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,

		  struct lov_user_md __user *lump);



/** @} lov */



#endif

drivers/staging/lustre/lustre/lov/lov_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -190,8 +190,6 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm, 
	       struct lov_stripe_md *lsm);

int lov_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,

		 struct lov_mds_md *lmm, int lmm_bytes);

int lov_getstripe(struct obd_export *exp,

		  struct lov_stripe_md *lsm, struct lov_user_md __user *lump);

int lov_alloc_memmd(struct lov_stripe_md **lsmp, __u16 stripe_count,

		    int pattern, int magic);

int lov_free_memmd(struct lov_stripe_md **lsmp);

drivers/staging/lustre/lustre/lov/lov_obd.c

+0 −3
Original line number Diff line number Diff line
@@ -1299,9 +1299,6 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len, 
		obd_ioctl_freedata(buf, len);

		break;

	}

	case LL_IOC_LOV_GETSTRIPE:

		rc = lov_getstripe(exp, karg, uarg);

		break;

	case OBD_IOC_QUOTACTL: {

		struct if_quotactl *qctl = karg;

		struct lov_tgt_desc *tgt = NULL;