Commit a823acf5 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove Size on MDS support 



Remove unused definitions related to Size on MDS support from
lustre/include/lustre/lustre_idl.h. Remove unused code from several
places in lustre/.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6047
Reviewed-on: http://review.whamcloud.com/13443


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarMike Pershin <mike.pershin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0bce7b93

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

+10 −31
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static inline int range_compare_loc(const struct lu_seq_range *r1, 
 */

enum lma_compat {

	LMAC_HSM	= 0x00000001,

	LMAC_SOM	= 0x00000002,

/*	LMAC_SOM	= 0x00000002, obsolete since 2.8.0 */

	LMAC_NOT_IN_OI	= 0x00000004, /* the object does NOT need OI mapping */

	LMAC_FID_ON_OST = 0x00000008, /* For OST-object, its OI mapping is

				       * under /O/<seq>/d<x>.
@@ -1923,7 +1923,7 @@ enum mds_cmd { 
	MDS_PIN			= 42, /* obsolete, never used in a release */

	MDS_UNPIN		= 43, /* obsolete, never used in a release */

	MDS_SYNC		= 44,

	MDS_DONE_WRITING	= 45,

	MDS_DONE_WRITING	= 45, /* obsolete since 2.8.0 */

	MDS_SET_INFO		= 46,

	MDS_QUOTACHECK		= 47,

	MDS_QUOTACTL		= 48,
@@ -2021,24 +2021,6 @@ enum { 
#define MDS_STATUS_CONN 1

#define MDS_STATUS_LOV 2



/* mdt_thread_info.mti_flags. */

enum md_op_flags {

	/* The flag indicates Size-on-MDS attributes are changed. */

	MF_SOM_CHANGE	   = (1 << 0),

	/* Flags indicates an epoch opens or closes. */

	MF_EPOCH_OPEN	   = (1 << 1),

	MF_EPOCH_CLOSE	  = (1 << 2),

	MF_MDC_CANCEL_FID1      = (1 << 3),

	MF_MDC_CANCEL_FID2      = (1 << 4),

	MF_MDC_CANCEL_FID3      = (1 << 5),

	MF_MDC_CANCEL_FID4      = (1 << 6),

	/* There is a pending attribute update. */

	MF_SOM_AU	       = (1 << 7),

	/* Cancel OST locks while getattr OST attributes. */

	MF_GETATTR_LOCK	 = (1 << 8),

	MF_GET_MDT_IDX	  = (1 << 9),

};



#define LUSTRE_BFLAG_UNCOMMITTED_WRITES   0x1



/* these should be identical to their EXT4_*_FL counterparts, they are
@@ -2123,10 +2105,10 @@ struct mdt_body { 
void lustre_swab_mdt_body(struct mdt_body *b);



struct mdt_ioepoch {

	struct lustre_handle handle;

	__u64  ioepoch;

	__u32  flags;

	__u32  padding;

	struct lustre_handle mio_handle;

	__u64 mio_unused1; /* was ioepoch */

	__u32 mio_unused2; /* was flags */

	__u32 mio_padding;

};



void lustre_swab_mdt_ioepoch(struct mdt_ioepoch *b);
@@ -2195,12 +2177,9 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa); 


#define MDS_FMODE_CLOSED	 00000000

#define MDS_FMODE_EXEC	   00000004

/* IO Epoch is opened on a closed file. */

#define MDS_FMODE_EPOCH	  01000000

/* IO Epoch is opened on a file truncate. */

#define MDS_FMODE_TRUNC	  02000000

/* Size-on-MDS Attribute Update is pending. */

#define MDS_FMODE_SOM	    04000000

/*	MDS_FMODE_EPOCH		01000000 obsolete since 2.8.0 */

/*	MDS_FMODE_TRUNC		02000000 obsolete since 2.8.0 */

/*	MDS_FMODE_SOM		04000000 obsolete since 2.8.0 */



#define MDS_OPEN_CREATED	 00000010

#define MDS_OPEN_CROSS	   00000020
@@ -2246,7 +2225,7 @@ enum mds_op_bias { 
	MDS_CROSS_REF		= 1 << 1,

	MDS_VTX_BYPASS		= 1 << 2,

	MDS_PERM_BYPASS		= 1 << 3,

	MDS_SOM			= 1 << 4,

/*	MDS_SOM			= 1 << 4, obsolete since 2.8.0 */

	MDS_QUOTA_IGNORE	= 1 << 5,

	MDS_CLOSE_CLEANUP	= 1 << 6,

	MDS_KEEP_ORPHAN		= 1 << 7,

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

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ extern struct req_format RQF_MDS_DISCONNECT; 
extern struct req_format RQF_MDS_GET_INFO;

extern struct req_format RQF_MDS_READPAGE;

extern struct req_format RQF_MDS_WRITEPAGE;

extern struct req_format RQF_MDS_DONE_WRITING;

extern struct req_format RQF_MDS_REINT;

extern struct req_format RQF_MDS_REINT_CREATE;

extern struct req_format RQF_MDS_REINT_CREATE_ACL;

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

+8 −0
Original line number Diff line number Diff line
@@ -755,6 +755,14 @@ static inline int it_to_lock_mode(struct lookup_intent *it) 
	return -EINVAL;

}



enum md_op_flags {

	MF_MDC_CANCEL_FID1	= BIT(0),

	MF_MDC_CANCEL_FID2      = BIT(1),

	MF_MDC_CANCEL_FID3      = BIT(2),

	MF_MDC_CANCEL_FID4      = BIT(3),

	MF_GET_MDT_IDX          = BIT(4),

};



enum md_cli_flags {

	CLI_SET_MEA	= BIT(0),

	CLI_RM_ENTRY	= BIT(1),

drivers/staging/lustre/lustre/include/obd_support.h

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ extern char obd_jobid_var[]; 
#define OBD_FAIL_MDS_ALL_REQUEST_NET     0x123

#define OBD_FAIL_MDS_SYNC_NET	    0x124

#define OBD_FAIL_MDS_SYNC_PACK	   0x125

#define OBD_FAIL_MDS_DONE_WRITING_NET    0x126

#define OBD_FAIL_MDS_DONE_WRITING_PACK   0x127

/*	OBD_FAIL_MDS_DONE_WRITING_NET	0x126 obsolete since 2.8.0 */

/*	OBD_FAIL_MDS_DONE_WRITING_PACK	0x127 obsolete since 2.8.0 */

#define OBD_FAIL_MDS_ALLOC_OBDO	  0x128

#define OBD_FAIL_MDS_PAUSE_OPEN	  0x129

#define OBD_FAIL_MDS_STATFS_LCW_SLEEP    0x12a

drivers/staging/lustre/lustre/mdc/mdc_lib.c

+4 −3
Original line number Diff line number Diff line
@@ -301,9 +301,10 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec, 
static void mdc_ioepoch_pack(struct mdt_ioepoch *epoch,

			     struct md_op_data *op_data)

{

	memcpy(&epoch->handle, &op_data->op_handle, sizeof(epoch->handle));

	epoch->ioepoch = 0;

	epoch->flags = 0;

	epoch->mio_handle = op_data->op_handle;

	epoch->mio_unused1 = 0;

	epoch->mio_unused2 = 0;

	epoch->mio_padding = 0;

}



void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,

CRA Git | Maintained and supported by SUSTech CRA and CCSE