Received-SPF: pass (google.com: domain of linux-nfs+bounces-262-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Sun, 3 Dec 2023 12:32:17 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: chenxiaosongemail@foxmail.com
Cc: trond.myklebust@hammerspace.com, anna@kernel.org, jlayton@kernel.org,
        neilb@suse.de, kolga@netapp.com, Dai.Ngo@oracle.com, tom@talpey.com,
        linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
        chenxiaosong@kylinos.cn, liuzhengyuan@kylinos.cn, huhai@kylinos.cn,
        liuyun01@kylinos.cn
Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to
 include/linux/nfs4.h
Message-ID: <ZWy7ob2HhNRX7Z1b@tissot.1015granger.net>
References: <tencent_03EDD0CAFBF93A9667CFCA1B68EDB4C4A109@qq.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <tencent_03EDD0CAFBF93A9667CFCA1B68EDB4C4A109@qq.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?GNfAFjJXzjoW8yGHYXa6IrLjFYhi1GkaImlko+rd5EZ2PDqZ2wbM3yqRsdbD?=
 =?us-ascii?Q?BSiYmFd+LdsZkDbpbVbVhJX6iqRpYK4OuAswqM/hax3gORkrz1U8efnvBhda?=
 =?us-ascii?Q?sMeKBFLadBf7FQz3zSQzIpXAtQyoIVNpZ/p4irQIsDCpEBsKgpj/sB18RAuq?=
 =?us-ascii?Q?mtKAa9Hk5kTkk9WnBQkvX/ifbdp/QMIay4XMVBIKs/aCkj/fNkKIp5YELCTb?=
 =?us-ascii?Q?0Ibck/E9dJw+wueozDS+Z9cB3Fp7Sm7VMK3zfGZNaiotOOt5qSJ/gHQSFpAb?=
 =?us-ascii?Q?n14yOYyPgv7M6KqTEK+vB4L2PtednpjcSd69yO42XsHIqLuDdoyRCEsLlj2N?=
 =?us-ascii?Q?JZg8kMBF6uAWfy7LBWEY08lvI9nbheu9KUQH/HKNSPDTglNYdpMf3a1LcQWx?=
 =?us-ascii?Q?lUfZtF4YBtIsFseelXKneP8XUVEXplfCE2KaqYn3bFcwzhOS/WMNaLN2kk+U?=
 =?us-ascii?Q?Wear2TIPdb/WbBBTFKgUuiiMCVQwyJqGmPXAHSAcZcneuItr4sw/v/hG0jIg?=
 =?us-ascii?Q?NkKcwysgvSKUEJvONsJdO9+5nFmOzm2kkuxvfHnfZt3IMyAUDfl7G3nfjbvH?=
 =?us-ascii?Q?RfhtwU0o8Za9M03A+dLwj2JrOJSq/G9t95NHqpBXjlLrzYMFwzWqUyyHOw1a?=
 =?us-ascii?Q?mZh4Fle+glf7Uivpa8dgCByEHrCaKraXX6FYxSJxZVWSyKALXQJMByY3X6k1?=
 =?us-ascii?Q?KoZstigO/M2XPvdCKhxjhpHsXdry9K6CUWvEeHEZziPWDnoYel68VX5FORij?=
 =?us-ascii?Q?xj2sKB94VdWxN6/DarJIgmkr5WwaiA7jLVhduiR7UjpxqjKoHHXeB/GSOyY7?=
 =?us-ascii?Q?nUHvHz1K3r4XsfF4o7SkihmimjeneGDZAHHAhnUbWniI0JyXnkpLoP+3p+/m?=
 =?us-ascii?Q?3d+Th+y50sD2QdC4mPgp2WQqrTadHJhMCucQ4JXlOViVv7kDDYYK14Z08zcw?=
 =?us-ascii?Q?/fbCihaoWKDBFM+E27XHn4fuLYDeFGyNFl0IdYIIZ+XbpYNgcYt37dPor4gX?=
 =?us-ascii?Q?5QOCPDOhB1dIRTByBKp5AtWqa49KuFHk5IBVfRH+KeB0siwM8EXMtLdCvGPd?=
 =?us-ascii?Q?7D2Hu9pWc99hlsCxnwtVWCO0VfH62nkjY7aTAxgNZl1Yf134TbF3O5D7ZVYB?=
 =?us-ascii?Q?amnDbXYZwSXmBUnhPUQLHBk75EVQhMtdf/8wltr4oj8IY8DqP/xjRSxfxGy2?=
 =?us-ascii?Q?S4pck4rkdBS1NrCjlUQ8Z7xqaE01yMfBavbrEJvRWVsAmnY3fxjvL+QKtpya?=
 =?us-ascii?Q?/yI8LB5WwF10vkNR5Yr5jSwSexlT0J+IBnbH9JBp6sJvcI8eZaIEfKawSKHt?=
 =?us-ascii?Q?LH/lfzRC3QN3IawxKustgjMEpT9EsaqHEdyNWrXnjbSqBO8UG5aIVYKv/UVA?=
 =?us-ascii?Q?ut3DGtrTOO7Z7P2gg8/l0pAdyHSAu9OzD8pVoCoBPq8UJXzmh0jGC9CgMkXJ?=
 =?us-ascii?Q?TuVcFyDf9fIjws8OHD9skIAC3g2i5yDUZVYRkb2CHfKjtc6MWCtGfqUWGdSj?=
 =?us-ascii?Q?dbO1EnntexR2iXkP8rJNjdu37GIXU8jKuX2PyivA/2RiGjn0DorPDSuPSpbJ?=
 =?us-ascii?Q?NF4NwdkAGhbt/nKNgvDgxwBT+O3X736M/tn6lCpu2lpJFaefSeQf0rvmaSHz?=
 =?us-ascii?Q?DQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	=?us-ascii?Q?wLZKEf/LEMMsOOBM9P178z/Hq24Cd89rxh/Ifi5X2g7kHPL0QAASJvlCeFCf?=
 =?us-ascii?Q?or547dlnGoqT5a450LiyyBvJoCzHVRR5loPsxcEVxGvO1Qhk+h5EoK5+Ow0u?=
 =?us-ascii?Q?GK8+wgjQOzagLswkSwO1Qms5jxw4R4gv+q17wzRX8zTOf1lkVEWvj7x6iow7?=
 =?us-ascii?Q?bCZfugR8ZtjmX2B94yNRDaaFoJ/3KRUguaoxzrMzZAudPyjxQAx2YKVQh9Xu?=
 =?us-ascii?Q?NPtMPBNIneKmii04+/KTi8yuZJTSJ6tVfMrU7+/Kg5J1Zw/KUMk3llcBEXUF?=
 =?us-ascii?Q?Fd92lGD+VdvuA0mp8XMrqEDqZmaLUCot8jEmazqzLOXTcdLbhC0sTPiRjHVn?=
 =?us-ascii?Q?BZamQPE6jB+ltsToT4zdJ3zEoXiGc2mGHFQFomxmummRIE8wqJxCkT1z//ZI?=
 =?us-ascii?Q?lw/6LQPaC91FNTHXwjRKgBCPvLTYAdXsolnW8gf0Dco85wwHdz5Uo4NB2gr/?=
 =?us-ascii?Q?t3iVok48ZYQySElnmGm6gRzczbHOKGVsQPikPj23D1B386pgG3O/TqYNRATh?=
 =?us-ascii?Q?73V9zXA9ljq48yFJpPbRaFPSEKduZpd4s/0WiMAfWGPayeTYwo+YlNonBs4A?=
 =?us-ascii?Q?waOVOVO3Hk6g0SuoweVM5Y2vxuUctJfcvHtIJZaoFbytimQUsGl8tSoam2RF?=
 =?us-ascii?Q?CU9y8sjeIM7tU8CDItD4O1/xv0VuUoxIe/PbQ7ZRpbc3cxlIi/hnzOtWvXNL?=
 =?us-ascii?Q?B3k8TaBYrCRpNoTpfX10rEQphnTXfdWnzmYJXEexCwgeEIN1bIB5jZSW5czd?=
 =?us-ascii?Q?Euevlff+et/94s52i0RADTAtrwRrxRiuGFb4dHrSrqlCGVzkfIuLgAD05GhL?=
 =?us-ascii?Q?01S9fK7ebxjwycZ9BbCouFdnK/rJIwV1/FJf8XDlzenAq85ss5ZQh+XrIA4H?=
 =?us-ascii?Q?14y7uuhuRPTu/M52aAsejS6NU+KGlXYakF0fzVxxbyNDxTYIMrEf2U+UhZij?=
 =?us-ascii?Q?NnPDo9KjRZVaixg72b/JL49lZZ6bTnACvdodqMtKttw=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 434b12ae-1d73-44a1-dada-08dbf425cdac
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2023 17:32:20.5976
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: bDX0udI3AhKEo32kJaBGgCFeces/Tr/MoR3vzq/Kq8TNAmL5gIqjA6PpWpHvUJX1l0JqH4JTwKuFLh9THrj2nA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6480
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-12-03_15,2023-11-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=867 mlxscore=0
 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000
 definitions=main-2312030138
X-Proofpoint-ORIG-GUID: QSMAtLXo3fFRsVfhxpXDb1HsYUThUuhZ
X-Proofpoint-GUID: QSMAtLXo3fFRsVfhxpXDb1HsYUThUuhZ

On Sat, Dec 02, 2023 at 09:07:25PM +0000, chenxiaosongemail@foxmail.com wrote:
> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
> 
> Callback operations enum is defined in client and server, move it to
> common header file.
> 
> Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>

LGTM.

I can take this through the nfsd-next tree if I get an Acked-by:
from the NFS client maintainers. If they would like to take this
through the NFS client tree, let me know, and I will send my
Acked-by.


> ---
>  fs/nfs/callback.h      | 19 -------------------
>  fs/nfsd/nfs4callback.c | 26 +-------------------------
>  include/linux/nfs4.h   | 22 ++++++++++++++++++++++
>  3 files changed, 23 insertions(+), 44 deletions(-)
> 
> diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
> index ccd4f245cae2..0279b78b5fc9 100644
> --- a/fs/nfs/callback.h
> +++ b/fs/nfs/callback.h
> @@ -19,25 +19,6 @@ enum nfs4_callback_procnum {
>  	CB_COMPOUND = 1,
>  };
>  
> -enum nfs4_callback_opnum {
> -	OP_CB_GETATTR = 3,
> -	OP_CB_RECALL  = 4,
> -/* Callback operations new to NFSv4.1 */
> -	OP_CB_LAYOUTRECALL  = 5,
> -	OP_CB_NOTIFY        = 6,
> -	OP_CB_PUSH_DELEG    = 7,
> -	OP_CB_RECALL_ANY    = 8,
> -	OP_CB_RECALLABLE_OBJ_AVAIL = 9,
> -	OP_CB_RECALL_SLOT   = 10,
> -	OP_CB_SEQUENCE      = 11,
> -	OP_CB_WANTS_CANCELLED = 12,
> -	OP_CB_NOTIFY_LOCK   = 13,
> -	OP_CB_NOTIFY_DEVICEID = 14,
> -/* Callback operations new to NFSv4.2 */
> -	OP_CB_OFFLOAD = 15,
> -	OP_CB_ILLEGAL = 10044,
> -};
> -
>  struct nfs4_slot;
>  struct cb_process_state {
>  	__be32			drc_status;
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 92bc109dabe6..30aa241038eb 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -31,6 +31,7 @@
>   *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
>  
> +#include <linux/nfs4.h>
>  #include <linux/sunrpc/clnt.h>
>  #include <linux/sunrpc/xprt.h>
>  #include <linux/sunrpc/svc_xprt.h>
> @@ -101,31 +102,6 @@ static int decode_cb_fattr4(struct xdr_stream *xdr, uint32_t *bitmap,
>  	return 0;
>  }
>  
> -/*
> - *	nfs_cb_opnum4
> - *
> - *	enum nfs_cb_opnum4 {
> - *		OP_CB_GETATTR		= 3,
> - *		  ...
> - *	};
> - */
> -enum nfs_cb_opnum4 {
> -	OP_CB_GETATTR			= 3,
> -	OP_CB_RECALL			= 4,
> -	OP_CB_LAYOUTRECALL		= 5,
> -	OP_CB_NOTIFY			= 6,
> -	OP_CB_PUSH_DELEG		= 7,
> -	OP_CB_RECALL_ANY		= 8,
> -	OP_CB_RECALLABLE_OBJ_AVAIL	= 9,
> -	OP_CB_RECALL_SLOT		= 10,
> -	OP_CB_SEQUENCE			= 11,
> -	OP_CB_WANTS_CANCELLED		= 12,
> -	OP_CB_NOTIFY_LOCK		= 13,
> -	OP_CB_NOTIFY_DEVICEID		= 14,
> -	OP_CB_OFFLOAD			= 15,
> -	OP_CB_ILLEGAL			= 10044
> -};
> -
>  static void encode_nfs_cb_opnum4(struct xdr_stream *xdr, enum nfs_cb_opnum4 op)
>  {
>  	__be32 *p;
> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
> index c11c4db34639..ef8d2d618d5b 100644
> --- a/include/linux/nfs4.h
> +++ b/include/linux/nfs4.h
> @@ -869,4 +869,26 @@ enum {
>  	RCA4_TYPE_MASK_OTHER_LAYOUT_MAX	= 15,
>  };
>  
> +enum nfs_cb_opnum4 {
> +	OP_CB_GETATTR = 3,
> +	OP_CB_RECALL  = 4,
> +
> +	/* Callback operations new to NFSv4.1 */
> +	OP_CB_LAYOUTRECALL  = 5,
> +	OP_CB_NOTIFY        = 6,
> +	OP_CB_PUSH_DELEG    = 7,
> +	OP_CB_RECALL_ANY    = 8,
> +	OP_CB_RECALLABLE_OBJ_AVAIL = 9,
> +	OP_CB_RECALL_SLOT   = 10,
> +	OP_CB_SEQUENCE      = 11,
> +	OP_CB_WANTS_CANCELLED = 12,
> +	OP_CB_NOTIFY_LOCK   = 13,
> +	OP_CB_NOTIFY_DEVICEID = 14,
> +
> +	/* Callback operations new to NFSv4.2 */
> +	OP_CB_OFFLOAD = 15,
> +
> +	OP_CB_ILLEGAL = 10044,
> +};
> +
>  #endif
> -- 
> 2.34.1
> 
> 

-- 
Chuck Lever