NFSv4.2: Clean up: Move the encode_copy_commit() function
authorAnna Schumaker <Anna.Schumaker@Netapp.com>
Thu, 4 May 2023 20:47:11 +0000 (16:47 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Mon, 19 Jun 2023 16:07:54 +0000 (12:07 -0400)
Move the function to be with the other encode_*() functions, instead of
in the middle of the nfs4_xdr_enc_*() section.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/nfs42xdr.c

index a6df815a140c71777819dea4ed482b640c42671c..dfac3f62c7ed7884970c26e7fe3b3896cf2ba9d0 100644 (file)
@@ -317,6 +317,18 @@ static void encode_copy(struct xdr_stream *xdr,
        encode_nl4_server(xdr, args->cp_src);
 }
 
+static void encode_copy_commit(struct xdr_stream *xdr,
+                         const struct nfs42_copy_args *args,
+                         struct compound_hdr *hdr)
+{
+       __be32 *p;
+
+       encode_op_hdr(xdr, OP_COMMIT, decode_commit_maxsz, hdr);
+       p = reserve_space(xdr, 12);
+       p = xdr_encode_hyper(p, args->dst_pos);
+       *p = cpu_to_be32(args->count);
+}
+
 static void encode_offload_cancel(struct xdr_stream *xdr,
                                  const struct nfs42_offload_status_args *args,
                                  struct compound_hdr *hdr)
@@ -671,18 +683,6 @@ static void nfs4_xdr_enc_allocate(struct rpc_rqst *req,
        encode_nops(&hdr);
 }
 
-static void encode_copy_commit(struct xdr_stream *xdr,
-                         const struct nfs42_copy_args *args,
-                         struct compound_hdr *hdr)
-{
-       __be32 *p;
-
-       encode_op_hdr(xdr, OP_COMMIT, decode_commit_maxsz, hdr);
-       p = reserve_space(xdr, 12);
-       p = xdr_encode_hyper(p, args->dst_pos);
-       *p = cpu_to_be32(args->count);
-}
-
 /*
  * Encode COPY request
  */