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

Commit 341f1f0a authored by Fan Yong's avatar Fan Yong Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove remote client support 



There are several obsolete sub commands for lfs to work with
remote client. We do not support that anymore, and should be
deleted along with any kernel code related to remote client.

Signed-off-by: default avatarFan Yong <fan.yong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6971
Reviewed-on: http://review.whamcloud.com/19789


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarLai Siyao <lai.siyao@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 af52739b

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

+15 −25
Original line number Original line Diff line number Diff line
@@ -1237,8 +1237,16 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); 
						  */

						  */

#define OBD_CONNECT_ATTRFID	       0x4000ULL /*Server can GetAttr By Fid*/

#define OBD_CONNECT_ATTRFID	       0x4000ULL /*Server can GetAttr By Fid*/

#define OBD_CONNECT_NODEVOH	       0x8000ULL /*No open hndl on specl nodes*/

#define OBD_CONNECT_NODEVOH	       0x8000ULL /*No open hndl on specl nodes*/

#define OBD_CONNECT_RMT_CLIENT	      0x10000ULL /*Remote client */

#define OBD_CONNECT_RMT_CLIENT	      0x10000ULL /* Remote client, never used

#define OBD_CONNECT_RMT_CLIENT_FORCE  0x20000ULL /*Remote client by force */

						  * in production. Removed in

						  * 2.9. Keep this flag to

						  * avoid reuse.

						  */

#define OBD_CONNECT_RMT_CLIENT_FORCE  0x20000ULL /* Remote client by force,

						  * never used in production.

						  * Removed in 2.9. Keep this

						  * flag to avoid reuse

						  */

#define OBD_CONNECT_BRW_SIZE	      0x40000ULL /*Max bytes per rpc */

#define OBD_CONNECT_BRW_SIZE	      0x40000ULL /*Max bytes per rpc */

#define OBD_CONNECT_QUOTA64	      0x80000ULL /*Not used since 2.4 */

#define OBD_CONNECT_QUOTA64	      0x80000ULL /*Not used since 2.4 */

#define OBD_CONNECT_MDS_CAPA	     0x100000ULL /*MDS capability */

#define OBD_CONNECT_MDS_CAPA	     0x100000ULL /*MDS capability */
@@ -1699,7 +1707,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic) 
#define OBD_MD_FLXATTRLS     (0x0000002000000000ULL) /* xattr list */

#define OBD_MD_FLXATTRLS     (0x0000002000000000ULL) /* xattr list */

#define OBD_MD_FLXATTRRM     (0x0000004000000000ULL) /* xattr remove */

#define OBD_MD_FLXATTRRM     (0x0000004000000000ULL) /* xattr remove */

#define OBD_MD_FLACL	     (0x0000008000000000ULL) /* ACL */

#define OBD_MD_FLACL	     (0x0000008000000000ULL) /* ACL */

#define OBD_MD_FLRMTPERM     (0x0000010000000000ULL) /* remote permission */

/*	OBD_MD_FLRMTPERM     (0x0000010000000000ULL) remote perm, obsolete */

#define OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) /* MDS capability */

#define OBD_MD_FLMDSCAPA     (0x0000020000000000ULL) /* MDS capability */

#define OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) /* OSS capability */

#define OBD_MD_FLOSSCAPA     (0x0000040000000000ULL) /* OSS capability */

#define OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) /* Check split on server */

#define OBD_MD_FLCKSPLIT     (0x0000080000000000ULL) /* Check split on server */
@@ -1711,10 +1719,10 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic) 
						      */

						      */

#define OBD_MD_FLOBJCOUNT    (0x0000400000000000ULL) /* for multiple destroy */

#define OBD_MD_FLOBJCOUNT    (0x0000400000000000ULL) /* for multiple destroy */





#define OBD_MD_FLRMTLSETFACL (0x0001000000000000ULL) /* lfs lsetfacl case */

/*	OBD_MD_FLRMTLSETFACL (0x0001000000000000ULL) lfs lsetfacl, obsolete */

#define OBD_MD_FLRMTLGETFACL (0x0002000000000000ULL) /* lfs lgetfacl case */

/*	OBD_MD_FLRMTLGETFACL (0x0002000000000000ULL) lfs lgetfacl, obsolete */

#define OBD_MD_FLRMTRSETFACL (0x0004000000000000ULL) /* lfs rsetfacl case */

/*	OBD_MD_FLRMTRSETFACL (0x0004000000000000ULL) lfs rsetfacl, obsolete */

#define OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) /* lfs rgetfacl case */

/*	OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) lfs rgetfacl, obsolete */





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

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

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

#define OBD_MD_FLRELEASED    (0x0020000000000000ULL) /* file released */
@@ -2155,26 +2163,8 @@ enum { 
	CFS_SETUID_PERM = 0x01,

	CFS_SETUID_PERM = 0x01,

	CFS_SETGID_PERM = 0x02,

	CFS_SETGID_PERM = 0x02,

	CFS_SETGRP_PERM = 0x04,

	CFS_SETGRP_PERM = 0x04,

	CFS_RMTACL_PERM = 0x08,

	CFS_RMTOWN_PERM = 0x10

};



/* inode access permission for remote user, the inode info are omitted,

 * for client knows them.

 */

struct mdt_remote_perm {

	__u32	   rp_uid;

	__u32	   rp_gid;

	__u32	   rp_fsuid;

	__u32	   rp_fsuid_h;

	__u32	   rp_fsgid;

	__u32	   rp_fsgid_h;

	__u32	   rp_access_perm; /* MAY_READ/WRITE/EXEC */

	__u32	   rp_padding;

};

};





void lustre_swab_mdt_remote_perm(struct mdt_remote_perm *p);



struct mdt_rec_setattr {

struct mdt_rec_setattr {

	__u32	   sa_opcode;

	__u32	   sa_opcode;

	__u32	   sa_cap;

	__u32	   sa_cap;

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

+1 −14
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ struct ost_id { 
#define IOC_OBD_STATFS		  _IOWR('f', 164, struct obd_statfs *)

#define IOC_OBD_STATFS		  _IOWR('f', 164, struct obd_statfs *)

#define IOC_LOV_GETINFO		 _IOWR('f', 165, struct lov_user_mds_data *)

#define IOC_LOV_GETINFO		 _IOWR('f', 165, struct lov_user_mds_data *)

#define LL_IOC_FLUSHCTX		 _IOW('f', 166, long)

#define LL_IOC_FLUSHCTX		 _IOW('f', 166, long)

#define LL_IOC_RMTACL		   _IOW('f', 167, long)

/* LL_IOC_RMTACL			167 obsolete */

#define LL_IOC_GETOBDCOUNT	      _IOR('f', 168, long)

#define LL_IOC_GETOBDCOUNT	      _IOR('f', 168, long)

#define LL_IOC_LLOOP_ATTACH	     _IOWR('f', 169, long)

#define LL_IOC_LLOOP_ATTACH	     _IOWR('f', 169, long)

#define LL_IOC_LLOOP_DETACH	     _IOWR('f', 170, long)

#define LL_IOC_LLOOP_DETACH	     _IOWR('f', 170, long)
@@ -538,19 +538,6 @@ struct identity_downcall_data { 
	__u32			    idd_groups[0];

	__u32			    idd_groups[0];

};

};





/* for non-mapped uid/gid */

#define NOBODY_UID      99

#define NOBODY_GID      99



#define INVALID_ID      (-1)



enum {

	RMT_LSETFACL    = 1,

	RMT_LGETFACL    = 2,

	RMT_RSETFACL    = 3,

	RMT_RGETFACL    = 4

};



/* lustre volatile file support

/* lustre volatile file support

 * file name header: .^L^S^T^R:volatile"

 * file name header: .^L^S^T^R:volatile"

 */

 */

drivers/staging/lustre/lustre/include/lustre_eacl.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -66,17 +66,6 @@ typedef struct { 
#define CFS_ACL_XATTR_COUNT(size, prefix) \

#define CFS_ACL_XATTR_COUNT(size, prefix) \

	(((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))

	(((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))





extern ext_acl_xattr_header *

lustre_posix_acl_xattr_2ext(posix_acl_xattr_header *header, int size);

extern int

lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, size_t size,

			      posix_acl_xattr_header **out);

extern void

lustre_ext_acl_xattr_free(ext_acl_xattr_header *header);

extern ext_acl_xattr_header *

lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,

			   ext_acl_xattr_header *ext_header);



#endif /* CONFIG_FS_POSIX_ACL */

#endif /* CONFIG_FS_POSIX_ACL */





/** @} eacl */

/** @} eacl */

drivers/staging/lustre/lustre/include/lustre_export.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -176,19 +176,6 @@ static inline int exp_connect_lru_resize(struct obd_export *exp) 
	return !!(exp_connect_flags(exp) & OBD_CONNECT_LRU_RESIZE);

	return !!(exp_connect_flags(exp) & OBD_CONNECT_LRU_RESIZE);

}

}





static inline int exp_connect_rmtclient(struct obd_export *exp)

{

	return !!(exp_connect_flags(exp) & OBD_CONNECT_RMT_CLIENT);

}



static inline int client_is_remote(struct obd_export *exp)

{

	struct obd_import *imp = class_exp2cliimp(exp);



	return !!(imp->imp_connect_data.ocd_connect_flags &

		  OBD_CONNECT_RMT_CLIENT);

}



static inline int exp_connect_vbr(struct obd_export *exp)

static inline int exp_connect_vbr(struct obd_export *exp)

{

{

	return !!(exp_connect_flags(exp) & OBD_CONNECT_VBR);

	return !!(exp_connect_flags(exp) & OBD_CONNECT_VBR);

drivers/staging/lustre/lustre/include/lustre_net.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1384,7 +1384,6 @@ struct ptlrpc_request { 
				 rq_bulk_write:1,    /* request bulk write */

				 rq_bulk_write:1,    /* request bulk write */

				 /* server authentication flags */

				 /* server authentication flags */

				 rq_auth_gss:1,      /* authenticated by gss */

				 rq_auth_gss:1,      /* authenticated by gss */

				 rq_auth_remote:1,   /* authed as remote user */

				 rq_auth_usr_root:1, /* authed as root */

				 rq_auth_usr_root:1, /* authed as root */

				 rq_auth_usr_mdt:1,  /* authed as mdt */

				 rq_auth_usr_mdt:1,  /* authed as mdt */

				 rq_auth_usr_ost:1,  /* authed as ost */

				 rq_auth_usr_ost:1,  /* authed as ost */