2023-12-02 21:07:41

by ChenXiaoSong

Subject: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h

From: ChenXiaoSong <[email protected]>

Callback operations enum is defined in client and server, move it to
common header file.

Signed-off-by: ChenXiaoSong <[email protected]>
---
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

2023-12-03 11:27:24

by Jeff Layton

Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h

On Sat, 2023-12-02 at 21:07 +0000, [email protected] wrote:
> From: ChenXiaoSong <[email protected]>
>
> Callback operations enum is defined in client and server, move it to
> common header file.
>
> Signed-off-by: ChenXiaoSong <[email protected]>
> ---
> 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

Reviewed-by: Jeff Layton <[email protected]>

2023-12-03 17:32:52

by Chuck Lever III

Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h

On Sat, Dec 02, 2023 at 09:07:25PM +0000, [email protected] wrote:
> From: ChenXiaoSong <[email protected]>
>
> Callback operations enum is defined in client and server, move it to
> common header file.
>
> Signed-off-by: ChenXiaoSong <[email protected]>

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

2023-12-04 20:32:04

by Anna Schumaker

Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h

On Sun, Dec 3, 2023 at 12:32 PM Chuck Lever <[email protected]> wrote:
>
> On Sat, Dec 02, 2023 at 09:07:25PM +0000, [email protected] wrote:
> > From: ChenXiaoSong <[email protected]>
> >
> > Callback operations enum is defined in client and server, move it to
> > common header file.
> >
> > Signed-off-by: ChenXiaoSong <[email protected]>
>
> 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 <[email protected]>

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

2023-12-04 22:05:37

by Chuck Lever III

Subject: Re: [PATCH] NFSv4, NFSD: move enum nfs_cb_opnum4 to include/linux/nfs4.h

On Mon, Dec 04, 2023 at 03:31:44PM -0500, Anna Schumaker wrote:
> On Sun, Dec 3, 2023 at 12:32 PM Chuck Lever <[email protected]> wrote:
> >
> > On Sat, Dec 02, 2023 at 09:07:25PM +0000, [email protected] wrote:
> > > From: ChenXiaoSong <[email protected]>
> > >
> > > Callback operations enum is defined in client and server, move it to
> > > common header file.
> > >
> > > Signed-off-by: ChenXiaoSong <[email protected]>
> >
> > 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 <[email protected]>

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