Received-SPF: pass (google.com: domain of linux-nfs+bounces-312-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <tencent_03EDD0CAFBF93A9667CFCA1B68EDB4C4A109@qq.com> <ZWy7ob2HhNRX7Z1b@tissot.1015granger.net>
In-Reply-To: <ZWy7ob2HhNRX7Z1b@tissot.1015granger.net>
From: Anna Schumaker <anna@kernel.org>
Date: Mon, 4 Dec 2023 15:31:44 -0500
Message-ID: <CAFX2JfmrGLmEsXccUGZ5drAJ9oxaqjTUxO0tPVgz_mf9YXZN+Q@mail.gmail.com>
Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h
To: Chuck Lever <chuck.lever@oracle.com>
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
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sun, Dec 3, 2023 at 12:32=E2=80=AFPM Chuck Lever <chuck.lever@oracle.com=
> wrote:
>
> On Sat, Dec 02, 2023 at 09:07:25PM +0000, chenxiaosongemail@foxmail.com w=
rote:
> > 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>

>
>
> > ---
> >  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 =3D 1,
> >  };
> >
> > -enum nfs4_callback_opnum {
> > -     OP_CB_GETATTR =3D 3,
> > -     OP_CB_RECALL  =3D 4,
> > -/* Callback operations new to NFSv4.1 */
> > -     OP_CB_LAYOUTRECALL  =3D 5,
> > -     OP_CB_NOTIFY        =3D 6,
> > -     OP_CB_PUSH_DELEG    =3D 7,
> > -     OP_CB_RECALL_ANY    =3D 8,
> > -     OP_CB_RECALLABLE_OBJ_AVAIL =3D 9,
> > -     OP_CB_RECALL_SLOT   =3D 10,
> > -     OP_CB_SEQUENCE      =3D 11,
> > -     OP_CB_WANTS_CANCELLED =3D 12,
> > -     OP_CB_NOTIFY_LOCK   =3D 13,
> > -     OP_CB_NOTIFY_DEVICEID =3D 14,
> > -/* Callback operations new to NFSv4.2 */
> > -     OP_CB_OFFLOAD =3D 15,
> > -     OP_CB_ILLEGAL =3D 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           =3D 3,
> > - *             ...
> > - *   };
> > - */
> > -enum nfs_cb_opnum4 {
> > -     OP_CB_GETATTR                   =3D 3,
> > -     OP_CB_RECALL                    =3D 4,
> > -     OP_CB_LAYOUTRECALL              =3D 5,
> > -     OP_CB_NOTIFY                    =3D 6,
> > -     OP_CB_PUSH_DELEG                =3D 7,
> > -     OP_CB_RECALL_ANY                =3D 8,
> > -     OP_CB_RECALLABLE_OBJ_AVAIL      =3D 9,
> > -     OP_CB_RECALL_SLOT               =3D 10,
> > -     OP_CB_SEQUENCE                  =3D 11,
> > -     OP_CB_WANTS_CANCELLED           =3D 12,
> > -     OP_CB_NOTIFY_LOCK               =3D 13,
> > -     OP_CB_NOTIFY_DEVICEID           =3D 14,
> > -     OP_CB_OFFLOAD                   =3D 15,
> > -     OP_CB_ILLEGAL                   =3D 10044
> > -};
> > -
> >  static void encode_nfs_cb_opnum4(struct xdr_stream *xdr, enum nfs_cb_o=
pnum4 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 =3D 15,
> >  };
> >
> > +enum nfs_cb_opnum4 {
> > +     OP_CB_GETATTR =3D 3,
> > +     OP_CB_RECALL  =3D 4,
> > +
> > +     /* Callback operations new to NFSv4.1 */
> > +     OP_CB_LAYOUTRECALL  =3D 5,
> > +     OP_CB_NOTIFY        =3D 6,
> > +     OP_CB_PUSH_DELEG    =3D 7,
> > +     OP_CB_RECALL_ANY    =3D 8,
> > +     OP_CB_RECALLABLE_OBJ_AVAIL =3D 9,
> > +     OP_CB_RECALL_SLOT   =3D 10,
> > +     OP_CB_SEQUENCE      =3D 11,
> > +     OP_CB_WANTS_CANCELLED =3D 12,
> > +     OP_CB_NOTIFY_LOCK   =3D 13,
> > +     OP_CB_NOTIFY_DEVICEID =3D 14,
> > +
> > +     /* Callback operations new to NFSv4.2 */
> > +     OP_CB_OFFLOAD =3D 15,
> > +
> > +     OP_CB_ILLEGAL =3D 10044,
> > +};
> > +
> >  #endif
> > --
> > 2.34.1
> >
> >
>
> --
> Chuck Lever