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

Commit 48d23e61 authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman
Browse files

staging/lustre/hsm: Add hsm_release feature. 

HSM Release is one of the key feature of HSM. To perform HSM
release, clients need to acquire the file lease exclusivelt and
flush dirty cache from clients. A special close REQ will be sent
to the MDT to release the lease and get rid of OST objects.

Lustre-change: http://review.whamcloud.com/7028
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1333


Signed-off-by: default avatarAurelien Degremont <aurelien.degremont@cea.fr>
Signed-off-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarAlex Zhuravlev <alexey.zhuravlev@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c92a0bf

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+13 −1
Original line number Diff line number Diff line
@@ -1761,6 +1761,7 @@ static inline __u32 lov_mds_md_size(__u16 stripes, __u32 lmm_magic) 
#define OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) /* lfs rgetfacl case */



#define OBD_MD_FLDATAVERSION (0x0010000000000000ULL) /* iversion sum */

#define OBD_MD_FLRELEASED    (0x0020000000000000ULL) /* file released */



#define OBD_MD_FLGETATTR (OBD_MD_FLID    | OBD_MD_FLATIME | OBD_MD_FLMTIME | \

			  OBD_MD_FLCTIME | OBD_MD_FLSIZE  | OBD_MD_FLBLKSZ | \
@@ -2397,6 +2398,7 @@ extern void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa); 
					      * delegation, succeed if it's not

					      * being opened with conflict mode.

					      */

#define MDS_OPEN_RELEASE   02000000000000ULL /* Open the file for HSM release */



/* permission for create non-directory file */

#define MAY_CREATE      (1 << 7)
@@ -2415,7 +2417,7 @@ extern void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa); 
/* lfs rgetfacl permission check */

#define MAY_RGETFACL    (1 << 14)



enum {

enum mds_op_bias {

	MDS_CHECK_SPLIT		= 1 << 0,

	MDS_CROSS_REF		= 1 << 1,

	MDS_VTX_BYPASS		= 1 << 2,
@@ -2428,6 +2430,7 @@ enum { 
	MDS_DATA_MODIFIED	= 1 << 9,

	MDS_CREATE_VOLATILE	= 1 << 10,

	MDS_OWNEROVERRIDE	= 1 << 11,

	MDS_HSM_RELEASE		= 1 << 12,

};



/* instance of mdt_reint_rec */
@@ -3751,5 +3754,14 @@ struct mdc_swap_layouts { 


void lustre_swab_swap_layouts(struct mdc_swap_layouts *msl);



struct close_data {

	struct lustre_handle	cd_handle;

	struct lu_fid		cd_fid;

	__u64			cd_data_version;

	__u64			cd_reserved[8];

};



void lustre_swab_close_data(struct close_data *data);



#endif

/** @} lustreidl */

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+7 −4
Original line number Diff line number Diff line
@@ -627,6 +627,9 @@ struct if_quotactl { 
#define SWAP_LAYOUTS_CHECK_DV2		(1 << 1)

#define SWAP_LAYOUTS_KEEP_MTIME		(1 << 2)

#define SWAP_LAYOUTS_KEEP_ATIME		(1 << 3)



/* Swap XATTR_NAME_HSM as well, only on the MDT so far */

#define SWAP_LAYOUTS_MDS_HSM		(1 << 31)

struct lustre_swap_layouts {

	__u64	sl_flags;

	__u32	sl_fd;

drivers/staging/lustre/lustre/include/lustre_req_layout.h

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ extern struct req_format RQF_UPDATE_OBJ; 
 */

extern struct req_format RQF_MDS_GETATTR_NAME;

extern struct req_format RQF_MDS_CLOSE;

extern struct req_format RQF_MDS_RELEASE_CLOSE;

extern struct req_format RQF_MDS_PIN;

extern struct req_format RQF_MDS_UNPIN;

extern struct req_format RQF_MDS_CONNECT;
@@ -262,6 +263,7 @@ extern struct req_msg_field RMF_GETINFO_VAL; 
extern struct req_msg_field RMF_GETINFO_VALLEN;

extern struct req_msg_field RMF_GETINFO_KEY;

extern struct req_msg_field RMF_IDX_INFO;

extern struct req_msg_field RMF_CLOSE_DATA;



/*

 * connection handle received in MDS_CONNECT request.

drivers/staging/lustre/lustre/include/obd.h

+5 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ struct md_op_data { 
	struct obd_capa	*op_capa2;



	/* Various operation flags. */

	__u32		   op_bias;

	enum mds_op_bias        op_bias;



	/* Operation type */

	__u32		   op_opc;
@@ -1084,6 +1084,10 @@ struct md_op_data { 
	/* used to transfer info between the stacks of MD client

	 * see enum op_cli_flags */

	__u32			op_cli_flags;



	/* File object data version for HSM release, on client */

	__u64			op_data_version;

	struct lustre_handle	op_lease_handle;

};



enum op_cli_flags {

drivers/staging/lustre/lustre/lclient/lcommon_misc.c

+3 −1
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock, 


	rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);

	if (rc) {

		LASSERT(rc < 0);

		/* Does not make sense to take GL for released layout */

		if (rc > 0)

			rc = -ENOTSUPP;

		cl_env_put(env, &refcheck);

		return rc;

	}