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

Commit e57721e7 authored by Niu Yawei's avatar Niu Yawei Committed by Greg Kroah-Hartman
Browse files

staging: lustre: quota: remove obsolete quota code 



Remove the obsolete quotacheck, quotaon and quotaoff, which
were retained for the interoperability with old (< 2.4) client
and server.

Some other obsolete quota code related to LL_IOC_QUOTACTL_18,
Q_INVLIDATE and Q_FINVALIDATE are removed as well.

Signed-off-by: default avatarNiu Yawei <yawei.niu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5975
Reviewed-on: http://review.whamcloud.com/14705


Reviewed-by: default avatarFan Yong <fan.yong@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 d0365097

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

+3 −3
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ enum ost_cmd { 
	OST_STATFS     = 13,

	OST_SYNC       = 16,

	OST_SET_INFO   = 17,

	OST_QUOTACHECK = 18,

	OST_QUOTACHECK = 18, /* not used since 2.4 */

	OST_QUOTACTL   = 19,

	OST_QUOTA_ADJUST_QUNIT = 20, /* not used since 2.4 */

	OST_LAST_OPC
@@ -1925,7 +1925,7 @@ enum mds_cmd { 
	MDS_SYNC		= 44,

	MDS_DONE_WRITING	= 45, /* obsolete since 2.8.0 */

	MDS_SET_INFO		= 46,

	MDS_QUOTACHECK		= 47,

	MDS_QUOTACHECK		= 47, /* not used since 2.4 */

	MDS_QUOTACTL		= 48,

	MDS_GETXATTR		= 49,

	MDS_SETXATTR		= 50, /* obsolete, now it's MDS_REINT op */
@@ -2889,7 +2889,7 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size); 
enum obd_cmd {

	OBD_PING = 400,

	OBD_LOG_CANCEL,

	OBD_QC_CALLBACK,

	OBD_QC_CALLBACK, /* not used since 2.4 */

	OBD_IDX_READ,

	OBD_LAST_OPC

};

drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -363,8 +363,8 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len) 
/*	OBD_IOC_LOV_GETSTRIPE	155 LL_IOC_LOV_GETSTRIPE */

/*	OBD_IOC_LOV_SETEA	156 LL_IOC_LOV_SETEA */

/*	lustre/lustre_user.h	157-159 */

#define	OBD_IOC_QUOTACHECK	_IOW('f', 160, int)

#define	OBD_IOC_POLL_QUOTACHECK	_IOR('f', 161, struct if_quotacheck *)

/*	OBD_IOC_QUOTACHECK	_IOW('f', 160, int) */

/*	OBD_IOC_POLL_QUOTACHECK	_IOR('f', 161, struct if_quotacheck *) */

#define OBD_IOC_QUOTACTL	_IOWR('f', 162, struct if_quotactl)

/*	lustre/lustre_user.h	163-176 */

#define OBD_IOC_CHANGELOG_REG	_IOW('f', 177, struct obd_ioctl_data)

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

+4 −9
Original line number Diff line number Diff line
@@ -557,23 +557,18 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen) 
#define Q_FINVALIDATE  0x800104 /* deprecated as of 2.4 */



/* these must be explicitly translated into linux Q_* in ll_dir_ioctl */

#define LUSTRE_Q_QUOTAON    0x800002     /* turn quotas on */

#define LUSTRE_Q_QUOTAOFF   0x800003     /* turn quotas off */

#define LUSTRE_Q_QUOTAON    0x800002	/* deprecated as of 2.4 */

#define LUSTRE_Q_QUOTAOFF   0x800003	/* deprecated as of 2.4 */

#define LUSTRE_Q_GETINFO    0x800005     /* get information about quota files */

#define LUSTRE_Q_SETINFO    0x800006     /* set information about quota files */

#define LUSTRE_Q_GETQUOTA   0x800007     /* get user quota structure */

#define LUSTRE_Q_SETQUOTA   0x800008     /* set user quota structure */

/* lustre-specific control commands */

#define LUSTRE_Q_INVALIDATE  0x80000b     /* invalidate quota data */

#define LUSTRE_Q_FINVALIDATE 0x80000c     /* invalidate filter quota data */

#define LUSTRE_Q_INVALIDATE  0x80000b	/* deprecated as of 2.4 */

#define LUSTRE_Q_FINVALIDATE 0x80000c	/* deprecated as of 2.4 */



#define UGQUOTA 2       /* set both USRQUOTA and GRPQUOTA */



struct if_quotacheck {

	char		    obd_type[16];

	struct obd_uuid	 obd_uuid;

};



#define IDENTITY_DOWNCALL_MAGIC 0x6d6dd629



/* permission */

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

+0 −3
Original line number Diff line number Diff line
@@ -165,9 +165,7 @@ extern struct req_format RQF_MDS_REINT_LINK; 
extern struct req_format RQF_MDS_REINT_RENAME;

extern struct req_format RQF_MDS_REINT_SETATTR;

extern struct req_format RQF_MDS_REINT_SETXATTR;

extern struct req_format RQF_MDS_QUOTACHECK;

extern struct req_format RQF_MDS_QUOTACTL;

extern struct req_format RQF_QC_CALLBACK;

extern struct req_format RQF_MDS_SWAP_LAYOUTS;

/* MDS hsm formats */

extern struct req_format RQF_MDS_HSM_STATE_GET;
@@ -180,7 +178,6 @@ extern struct req_format RQF_MDS_HSM_REQUEST; 
/* OST req_format */

extern struct req_format RQF_OST_CONNECT;

extern struct req_format RQF_OST_DISCONNECT;

extern struct req_format RQF_OST_QUOTACHECK;

extern struct req_format RQF_OST_QUOTACTL;

extern struct req_format RQF_OST_GETATTR;

extern struct req_format RQF_OST_SETATTR;

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

+0 −9
Original line number Diff line number Diff line
@@ -345,13 +345,6 @@ struct client_obd { 
	/* also protected by the poorly named _loi_list_lock lock above */

	struct osc_async_rc      cl_ar;



	/* used by quotacheck when the servers are older than 2.4 */

	int		      cl_qchk_stat; /* quotacheck stat of the peer */

#define CL_NOT_QUOTACHECKED 1   /* client->cl_qchk_stat init value */

#if OBD_OCD_VERSION(2, 7, 53, 0) < LUSTRE_VERSION_CODE

#warning "please consider removing quotacheck compatibility code"

#endif



	/* sequence manager */

	struct lu_client_seq    *cl_seq;
@@ -930,8 +923,6 @@ struct obd_ops { 
	struct obd_uuid *(*get_uuid)(struct obd_export *exp);



	/* quota methods */

	int (*quotacheck)(struct obd_device *, struct obd_export *,

			  struct obd_quotactl *);

	int (*quotactl)(struct obd_device *, struct obd_export *,

			struct obd_quotactl *);