Received-SPF: pass (google.com: domain of linux-nfs+bounces-317-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 4 Dec 2023 17:05:01 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Anna Schumaker <anna@kernel.org>
Cc: chenxiaosongemail@foxmail.com, trond.myklebust@hammerspace.com,
        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: <ZW5NDYCmJtEWSEB4@tissot.1015granger.net>
References: <tencent_03EDD0CAFBF93A9667CFCA1B68EDB4C4A109@qq.com>
 <ZWy7ob2HhNRX7Z1b@tissot.1015granger.net>
 <CAFX2JfmrGLmEsXccUGZ5drAJ9oxaqjTUxO0tPVgz_mf9YXZN+Q@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAFX2JfmrGLmEsXccUGZ5drAJ9oxaqjTUxO0tPVgz_mf9YXZN+Q@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?dFRmVU9USk41VVVzdmxHYUN0ZmNoUnBZeFFjUlRHclV5K293YmU0dW5ZcVBn?=
 =?utf-8?B?aHFtTnlJZVFGRVFCdTVidk1qN0xqSWpERHE1aEp0bFR0UTh0ckwzaTRwWThN?=
 =?utf-8?B?M0pXbDRraWRmNzRVcUNyOWk3MnRmRlpFOHpqYzJ6V1RzTDQwdnIwNXFWVWNB?=
 =?utf-8?B?K2xjUVBHQ3E2ZWQ5blhyeWd0cWJRckZwaDFuc0JlU1JrdVlrLzFGOUJKZ3hV?=
 =?utf-8?B?bVpDWHNYZnkyVHo4S1RQK1ZjeXMzQnE3TjRpbTdWY2QxMW9BNGpyeXlPYkdv?=
 =?utf-8?B?VVpJUWtXTy9vZUJCQlBvL3JKWlM3MDNUZVZrSXVtKzgwbU1SK0toYW5vc0U1?=
 =?utf-8?B?NUdBYlFPbWl0WGRwdGpieEdoOFhJYkw4Q0pIUFJkbUZwMnIwTUl1ejVLV1RC?=
 =?utf-8?B?T0ZtWnJNUkM4MktabmNwc2hQempoTkxERkkrZEpPbVg2UiswdFpodTRKSDYw?=
 =?utf-8?B?OHNncTR1WlBIVFpteEcxTjJNODgvY1l5UERVUDA3QThuUmJxZzFvZm9OVlJG?=
 =?utf-8?B?SzBRRGxyQUZvQnBydEFqYzY1cGR3MGE1aGlub2huYUd6bXBZMkYvS1VxN0ty?=
 =?utf-8?B?OVZqMzA0OVhsR0luekxvcHM1WVY1RU9PK05JQ0tNS2NvSVMzTzRqa0M3Qm9V?=
 =?utf-8?B?b3ZUN3lxUG8rQzVQdmN3WldaLys3SXFWdmxKMDNUQkIvSEpZbEJzZjEreEtO?=
 =?utf-8?B?NE9VazJEWEwxZ3c3UVNEdE1NMy9taEJDTzBkYjlTa3lXNEdOOCtKek5jVFQ4?=
 =?utf-8?B?YUE4MUNJdUZ6QjJFd3crTnBLOTVXdjhONnZSM09GUnd2OVlFcW0zWFRrNzdS?=
 =?utf-8?B?ZlpJbjUyZjAxMU9adXB3bjA3eWgvaXhnOGZmMVNBR1BUOXl6NkVTenVaYWpP?=
 =?utf-8?B?VDBibmZYTEVVOU1xNUEyZERvRTNwK1NNMmhubkR1UmZ3ZllDMmVvUG5SdE03?=
 =?utf-8?B?NVEyVUEwWjJLTSs2MUJNaGZjOE9yS2JMS3dDUVdPVlA4dXB2cHRBQTU3RHV3?=
 =?utf-8?B?c3FDRmpsZnpWV2orOCtmeGVING5MRlA0b1VZNk9hWG5OcTJIY1llOWl4Y3hW?=
 =?utf-8?B?djdoY3cyd3Nva0o0TENKOWR3SVBKOEhGei8zVk9FYWZ1ZkhOL0VnZ0JWdzlM?=
 =?utf-8?B?eUVLOS9uNkRmYlpTbTFGaE9zb2F3Si93cHJNRjR5alhRTDMxYVhNNEVjcG1V?=
 =?utf-8?B?QjMrUldxYWtNY2NMRnpMWUV4SGJFNFNXaUh5dm9lbnB4TXZiNTBZcDdlcTlz?=
 =?utf-8?B?RTVwcHlJSmxOMTNsb3hWWUdXSEVaSVBERVE5TFQzbnhNUWNHeUtNREpFdEh4?=
 =?utf-8?B?ejFsQkE2WVcvaVpkMFZzdXFvZGw2SHVaZU9xN1NuSVhJQ29xNk1tVi9Ycld6?=
 =?utf-8?B?cWJ6UmF3c3U1LzRGR01hU2dMc3hYZkMwYitpTkxESDVwK08yY3Yxb0k2dWN1?=
 =?utf-8?B?WTBMZkJRVHppRnVLQkE4ZjVrSXJiWE0wK2pvSUlWbUZPdi9hS21zUmpYSUdm?=
 =?utf-8?B?ekk3OVY3TDNWUDROb2hEVlBPcHVLTFZFTjVrbDlrMHIxcXR6d2ZXN3hsdDd3?=
 =?utf-8?B?RkM0bEJJQlh1TlpFdWR6dk9RbUpORTRBVW9PL0lPV0FuL3JrTDBldVdnV3Vs?=
 =?utf-8?B?M2lVSUZRUFBadnlhM2l1ZkhwL0pSdCtwaEZiYUhIVWk0U2RtK3ZoWlk5SFhi?=
 =?utf-8?B?dEh6T3hHZ0dVc3FhK2RSRWoyM2xvdWtrMkFPR0p5ZzVVeVc4eGZ1QWlQREU3?=
 =?utf-8?B?cXh4K0xSZ3FxcFZYejF1aGw5Tmh1ZkZjS1A5TWczVlZodmNQeUtZbWVWWTFq?=
 =?utf-8?B?TEhxK0l2YThzUitKTnFPemUwa0FFanpEU3R6M0dHYnhlamUzb2I4aVVUUzdD?=
 =?utf-8?B?b1pMTGZ1OW13Q0U1Z3hYSys1NXp1MllLUFBFZHd3Qy91OHJBZlNIZm9ZRDlm?=
 =?utf-8?B?ZnI2WDI5azg0LzlITFdoZFlhM2VSQU5rNjdPWS9ucmFPVlplWVhyeUR0ajE3?=
 =?utf-8?B?NmR1WDlEVXJqTGhhMHdqT1ZMVVkzcGFubEtxSm9OalBuK0IweHpBUkptUXhW?=
 =?utf-8?B?TzZ5WUtzd2J1WHFOOEZWSWJ5YXI2OUJLTDFQd1djMkJKZk1BUHp6RWhrLzlr?=
 =?utf-8?B?Q3M3UXZob0Z2MkNpbkdpcjlZdk04b2xWVU42VGxDcVl6R1pyVFJtZW43cnc2?=
 =?utf-8?B?dEE9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	=?utf-8?B?YTB3c3NKSDBsZnRLMlhxUFQ4TDRqZkFPZTNUTjNWNEZDSVp0NzMrRUdZcDc3?=
 =?utf-8?B?cit3WkppNWhzQjlhV3N1TWtvQmswZ0piZkdTbENoOEx6L2ZjMG9ycGtjSVFY?=
 =?utf-8?B?cjJnUlhYeThpcnFwdU0vMFlERHFuaVFUY3djRHRQMkFtR2RFN0lvWlQwMmVX?=
 =?utf-8?B?U1QzNC9uS0ZNZE1OaXhkOFZUdmhuTTVjWnlNcGcvL2YvejBVRzNIUENCWnBa?=
 =?utf-8?B?MEF5Um5DM2pXWHZnTHB2clFHeVovTzBUSEZZYUhmTVBTbEQ4dHdENlk4OHB6?=
 =?utf-8?B?RHRMWHR6WFBmblNSWXlCZVVXM1M3Vnp5WWhQKzVncXJML2R0Wkw0eWpuamo4?=
 =?utf-8?B?U3FVMkp3ZlNiZTJTTGQ5alVQb1Fzc2VONjc1dEIxNXFCekhPNy9QUjB5bkpL?=
 =?utf-8?B?UmdUckg4b214NExjaDd5Qzlxcm1KcDl0bGhOOHBtOUZqenU0MVFWSFZKZmto?=
 =?utf-8?B?WWdoditkeWJjTmhha01HWXBiUDNzVkRjYmZXRSs3bUJCZ09LL3F0b2k5VGxU?=
 =?utf-8?B?a0o3V3JxcS8yTjZOL2tZWnpoMVJ0ajNNNXNlWVE4bUp2K0hnVXk2N25tNlZJ?=
 =?utf-8?B?aGppLyt5VWxJbEZSVWRTem9KN0JkMlp6UDB0a25nVWRFOUV0eWpyVjJJbWdq?=
 =?utf-8?B?V3QySlFud2F6NGgvVlBSbGZTMW94d1FqK3gvQWdKQ0ZtOHpJbUpXWDhoc2xk?=
 =?utf-8?B?U3BvY2ZpamhYN3lIZWQvSlN2VWRNMitjOU56ZFRIbDBXczA0aW1kaGtVbUla?=
 =?utf-8?B?TmQwOHBJaXp1TFFiZ2tWYmdCamxtRGFCY25ReVY4K1UzNWlXOUZOZk9qcnJM?=
 =?utf-8?B?ZmQ2TW1zb0JpVm0zS1dPQVZxanRkZW1IK3VBYnNnenZFYkUwaDNKVXN2b3dt?=
 =?utf-8?B?eHJWZWVFL1ZlK0Y5Z1hLeVkvWUhiVnRvTWZ4dXh0VmQvcDBNUDU5b3hTMHZj?=
 =?utf-8?B?MUN0NnN3QzFadzNzZEtlYUJDV2luOFgvN29OcUI5dVZJUHhnTjdPL2VwWTNM?=
 =?utf-8?B?Y1JWbTczK1VXbXRXZ3BNVlVJUnU2SkgwTlh2Qk1iQUFHTUdiVzM0dGlWWXhH?=
 =?utf-8?B?ZytwbDczTzFGeE9Jcm9iNVV6a3VxTlFGYWIyNnB4a3JnRS9Qa1N2RUJWbW41?=
 =?utf-8?B?c2xNZmNmUEFkWGdtdFFScEtVaVRpRXZuSjRYeklxVk5FaGJHZE1kb1FCRTk1?=
 =?utf-8?B?UlgwOHIrWGZBTzdjOWRPYWZCcXhjLy9naW5rM21PWHZNaWNkcE5QaVlKRTlS?=
 =?utf-8?B?eXpJM0xrY1VMYWpBeENOQk1mWC94VVhNWmluVGFIcTdDMnJGSnB0bzZLbEZT?=
 =?utf-8?Q?J/gr3eZxZuz6A=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8012aea-229b-4272-f086-08dbf5151239
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 22:05:05.4554
 (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: 4c1dIFUI1zhUepSaExeSjk0Ui4acoJ8i9LpEOISvgfgVm2fV7fp/C8ynLUbsMtz9fMJ6+D6Ffc22pQpnlUckAA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4113
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-04_20,2023-12-04_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0
 malwarescore=0 phishscore=0 bulkscore=0 adultscore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311060000 definitions=main-2312040173
X-Proofpoint-ORIG-GUID: hmSvyMEzG1P2B0zK5s771pr4vysQYLK9
X-Proofpoint-GUID: hmSvyMEzG1P2B0zK5s771pr4vysQYLK9

On Mon, Dec 04, 2023 at 03:31:44PM -0500, Anna Schumaker wrote:
> On Sun, Dec 3, 2023 at 12:32 PM Chuck Lever <chuck.lever@oracle.com> wrote:
> >
> > 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.
> 
> Looks fine to me, and I'm okay with you taking it:
> 
> Acked-by: Anna Schumaker <Anna.Schumaker@netapp.com>

Thanks, everyone! Applied to nfsd-next for v6.8.


> > > ---
> > >  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

-- 
Chuck Lever