diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:40 -0400 |
commit | 8687b63afbe42103730bff4d3f7bfff3463c303e (patch) | |
tree | 7fbb146c0560ed11d063cfd296f2651242ff1adf /fs/nfs/nfs4xdr.c | |
parent | d61005a6855160091dca44b718db93fe7aa9876f (diff) |
[PATCH] xdr annotations: NFSv4
on-the-wire data is big-endian
[in large part pulled from Alexey's patch]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 358 |
1 files changed, 181 insertions, 177 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 3dd413f52da1..e284123b9774 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -471,7 +471,7 @@ struct compound_hdr { | |||
471 | 471 | ||
472 | static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) | 472 | static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) |
473 | { | 473 | { |
474 | uint32_t *p; | 474 | __be32 *p; |
475 | 475 | ||
476 | p = xdr_reserve_space(xdr, 4 + len); | 476 | p = xdr_reserve_space(xdr, 4 + len); |
477 | BUG_ON(p == NULL); | 477 | BUG_ON(p == NULL); |
@@ -480,7 +480,7 @@ static void encode_string(struct xdr_stream *xdr, unsigned int len, const char * | |||
480 | 480 | ||
481 | static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | 481 | static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) |
482 | { | 482 | { |
483 | uint32_t *p; | 483 | __be32 *p; |
484 | 484 | ||
485 | dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag); | 485 | dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag); |
486 | BUG_ON(hdr->taglen > NFS4_MAXTAGLEN); | 486 | BUG_ON(hdr->taglen > NFS4_MAXTAGLEN); |
@@ -494,7 +494,7 @@ static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
494 | 494 | ||
495 | static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf) | 495 | static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf) |
496 | { | 496 | { |
497 | uint32_t *p; | 497 | __be32 *p; |
498 | 498 | ||
499 | p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE); | 499 | p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE); |
500 | BUG_ON(p == NULL); | 500 | BUG_ON(p == NULL); |
@@ -507,8 +507,8 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s | |||
507 | char owner_group[IDMAP_NAMESZ]; | 507 | char owner_group[IDMAP_NAMESZ]; |
508 | int owner_namelen = 0; | 508 | int owner_namelen = 0; |
509 | int owner_grouplen = 0; | 509 | int owner_grouplen = 0; |
510 | uint32_t *p; | 510 | __be32 *p; |
511 | uint32_t *q; | 511 | __be32 *q; |
512 | int len; | 512 | int len; |
513 | uint32_t bmval0 = 0; | 513 | uint32_t bmval0 = 0; |
514 | uint32_t bmval1 = 0; | 514 | uint32_t bmval1 = 0; |
@@ -630,7 +630,7 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s | |||
630 | 630 | ||
631 | static int encode_access(struct xdr_stream *xdr, u32 access) | 631 | static int encode_access(struct xdr_stream *xdr, u32 access) |
632 | { | 632 | { |
633 | uint32_t *p; | 633 | __be32 *p; |
634 | 634 | ||
635 | RESERVE_SPACE(8); | 635 | RESERVE_SPACE(8); |
636 | WRITE32(OP_ACCESS); | 636 | WRITE32(OP_ACCESS); |
@@ -641,7 +641,7 @@ static int encode_access(struct xdr_stream *xdr, u32 access) | |||
641 | 641 | ||
642 | static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | 642 | static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) |
643 | { | 643 | { |
644 | uint32_t *p; | 644 | __be32 *p; |
645 | 645 | ||
646 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 646 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
647 | WRITE32(OP_CLOSE); | 647 | WRITE32(OP_CLOSE); |
@@ -653,7 +653,7 @@ static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | |||
653 | 653 | ||
654 | static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args) | 654 | static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args) |
655 | { | 655 | { |
656 | uint32_t *p; | 656 | __be32 *p; |
657 | 657 | ||
658 | RESERVE_SPACE(16); | 658 | RESERVE_SPACE(16); |
659 | WRITE32(OP_COMMIT); | 659 | WRITE32(OP_COMMIT); |
@@ -665,7 +665,7 @@ static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *arg | |||
665 | 665 | ||
666 | static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create) | 666 | static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create) |
667 | { | 667 | { |
668 | uint32_t *p; | 668 | __be32 *p; |
669 | 669 | ||
670 | RESERVE_SPACE(8); | 670 | RESERVE_SPACE(8); |
671 | WRITE32(OP_CREATE); | 671 | WRITE32(OP_CREATE); |
@@ -697,7 +697,7 @@ static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *c | |||
697 | 697 | ||
698 | static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) | 698 | static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) |
699 | { | 699 | { |
700 | uint32_t *p; | 700 | __be32 *p; |
701 | 701 | ||
702 | RESERVE_SPACE(12); | 702 | RESERVE_SPACE(12); |
703 | WRITE32(OP_GETATTR); | 703 | WRITE32(OP_GETATTR); |
@@ -708,7 +708,7 @@ static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) | |||
708 | 708 | ||
709 | static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1) | 709 | static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1) |
710 | { | 710 | { |
711 | uint32_t *p; | 711 | __be32 *p; |
712 | 712 | ||
713 | RESERVE_SPACE(16); | 713 | RESERVE_SPACE(16); |
714 | WRITE32(OP_GETATTR); | 714 | WRITE32(OP_GETATTR); |
@@ -740,7 +740,7 @@ static int encode_fs_locations(struct xdr_stream *xdr, const u32* bitmask) | |||
740 | 740 | ||
741 | static int encode_getfh(struct xdr_stream *xdr) | 741 | static int encode_getfh(struct xdr_stream *xdr) |
742 | { | 742 | { |
743 | uint32_t *p; | 743 | __be32 *p; |
744 | 744 | ||
745 | RESERVE_SPACE(4); | 745 | RESERVE_SPACE(4); |
746 | WRITE32(OP_GETFH); | 746 | WRITE32(OP_GETFH); |
@@ -750,7 +750,7 @@ static int encode_getfh(struct xdr_stream *xdr) | |||
750 | 750 | ||
751 | static int encode_link(struct xdr_stream *xdr, const struct qstr *name) | 751 | static int encode_link(struct xdr_stream *xdr, const struct qstr *name) |
752 | { | 752 | { |
753 | uint32_t *p; | 753 | __be32 *p; |
754 | 754 | ||
755 | RESERVE_SPACE(8 + name->len); | 755 | RESERVE_SPACE(8 + name->len); |
756 | WRITE32(OP_LINK); | 756 | WRITE32(OP_LINK); |
@@ -780,7 +780,7 @@ static inline uint64_t nfs4_lock_length(struct file_lock *fl) | |||
780 | */ | 780 | */ |
781 | static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) | 781 | static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) |
782 | { | 782 | { |
783 | uint32_t *p; | 783 | __be32 *p; |
784 | 784 | ||
785 | RESERVE_SPACE(32); | 785 | RESERVE_SPACE(32); |
786 | WRITE32(OP_LOCK); | 786 | WRITE32(OP_LOCK); |
@@ -809,7 +809,7 @@ static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) | |||
809 | 809 | ||
810 | static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args) | 810 | static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args) |
811 | { | 811 | { |
812 | uint32_t *p; | 812 | __be32 *p; |
813 | 813 | ||
814 | RESERVE_SPACE(40); | 814 | RESERVE_SPACE(40); |
815 | WRITE32(OP_LOCKT); | 815 | WRITE32(OP_LOCKT); |
@@ -825,7 +825,7 @@ static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *arg | |||
825 | 825 | ||
826 | static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args) | 826 | static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args) |
827 | { | 827 | { |
828 | uint32_t *p; | 828 | __be32 *p; |
829 | 829 | ||
830 | RESERVE_SPACE(44); | 830 | RESERVE_SPACE(44); |
831 | WRITE32(OP_LOCKU); | 831 | WRITE32(OP_LOCKU); |
@@ -841,7 +841,7 @@ static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *arg | |||
841 | static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) | 841 | static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) |
842 | { | 842 | { |
843 | int len = name->len; | 843 | int len = name->len; |
844 | uint32_t *p; | 844 | __be32 *p; |
845 | 845 | ||
846 | RESERVE_SPACE(8 + len); | 846 | RESERVE_SPACE(8 + len); |
847 | WRITE32(OP_LOOKUP); | 847 | WRITE32(OP_LOOKUP); |
@@ -853,7 +853,7 @@ static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) | |||
853 | 853 | ||
854 | static void encode_share_access(struct xdr_stream *xdr, int open_flags) | 854 | static void encode_share_access(struct xdr_stream *xdr, int open_flags) |
855 | { | 855 | { |
856 | uint32_t *p; | 856 | __be32 *p; |
857 | 857 | ||
858 | RESERVE_SPACE(8); | 858 | RESERVE_SPACE(8); |
859 | switch (open_flags & (FMODE_READ|FMODE_WRITE)) { | 859 | switch (open_flags & (FMODE_READ|FMODE_WRITE)) { |
@@ -874,7 +874,7 @@ static void encode_share_access(struct xdr_stream *xdr, int open_flags) | |||
874 | 874 | ||
875 | static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 875 | static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
876 | { | 876 | { |
877 | uint32_t *p; | 877 | __be32 *p; |
878 | /* | 878 | /* |
879 | * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4, | 879 | * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4, |
880 | * owner 4 = 32 | 880 | * owner 4 = 32 |
@@ -891,7 +891,7 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena | |||
891 | 891 | ||
892 | static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 892 | static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
893 | { | 893 | { |
894 | uint32_t *p; | 894 | __be32 *p; |
895 | 895 | ||
896 | RESERVE_SPACE(4); | 896 | RESERVE_SPACE(4); |
897 | switch(arg->open_flags & O_EXCL) { | 897 | switch(arg->open_flags & O_EXCL) { |
@@ -907,7 +907,7 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_op | |||
907 | 907 | ||
908 | static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 908 | static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
909 | { | 909 | { |
910 | uint32_t *p; | 910 | __be32 *p; |
911 | 911 | ||
912 | RESERVE_SPACE(4); | 912 | RESERVE_SPACE(4); |
913 | switch (arg->open_flags & O_CREAT) { | 913 | switch (arg->open_flags & O_CREAT) { |
@@ -923,7 +923,7 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a | |||
923 | 923 | ||
924 | static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) | 924 | static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) |
925 | { | 925 | { |
926 | uint32_t *p; | 926 | __be32 *p; |
927 | 927 | ||
928 | RESERVE_SPACE(4); | 928 | RESERVE_SPACE(4); |
929 | switch (delegation_type) { | 929 | switch (delegation_type) { |
@@ -943,7 +943,7 @@ static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation | |||
943 | 943 | ||
944 | static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *name) | 944 | static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *name) |
945 | { | 945 | { |
946 | uint32_t *p; | 946 | __be32 *p; |
947 | 947 | ||
948 | RESERVE_SPACE(4); | 948 | RESERVE_SPACE(4); |
949 | WRITE32(NFS4_OPEN_CLAIM_NULL); | 949 | WRITE32(NFS4_OPEN_CLAIM_NULL); |
@@ -952,7 +952,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr * | |||
952 | 952 | ||
953 | static inline void encode_claim_previous(struct xdr_stream *xdr, int type) | 953 | static inline void encode_claim_previous(struct xdr_stream *xdr, int type) |
954 | { | 954 | { |
955 | uint32_t *p; | 955 | __be32 *p; |
956 | 956 | ||
957 | RESERVE_SPACE(4); | 957 | RESERVE_SPACE(4); |
958 | WRITE32(NFS4_OPEN_CLAIM_PREVIOUS); | 958 | WRITE32(NFS4_OPEN_CLAIM_PREVIOUS); |
@@ -961,7 +961,7 @@ static inline void encode_claim_previous(struct xdr_stream *xdr, int type) | |||
961 | 961 | ||
962 | static inline void encode_claim_delegate_cur(struct xdr_stream *xdr, const struct qstr *name, const nfs4_stateid *stateid) | 962 | static inline void encode_claim_delegate_cur(struct xdr_stream *xdr, const struct qstr *name, const nfs4_stateid *stateid) |
963 | { | 963 | { |
964 | uint32_t *p; | 964 | __be32 *p; |
965 | 965 | ||
966 | RESERVE_SPACE(4+sizeof(stateid->data)); | 966 | RESERVE_SPACE(4+sizeof(stateid->data)); |
967 | WRITE32(NFS4_OPEN_CLAIM_DELEGATE_CUR); | 967 | WRITE32(NFS4_OPEN_CLAIM_DELEGATE_CUR); |
@@ -991,7 +991,7 @@ static int encode_open(struct xdr_stream *xdr, const struct nfs_openargs *arg) | |||
991 | 991 | ||
992 | static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg) | 992 | static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg) |
993 | { | 993 | { |
994 | uint32_t *p; | 994 | __be32 *p; |
995 | 995 | ||
996 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 996 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
997 | WRITE32(OP_OPEN_CONFIRM); | 997 | WRITE32(OP_OPEN_CONFIRM); |
@@ -1003,7 +1003,7 @@ static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_con | |||
1003 | 1003 | ||
1004 | static int encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | 1004 | static int encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg) |
1005 | { | 1005 | { |
1006 | uint32_t *p; | 1006 | __be32 *p; |
1007 | 1007 | ||
1008 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 1008 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
1009 | WRITE32(OP_OPEN_DOWNGRADE); | 1009 | WRITE32(OP_OPEN_DOWNGRADE); |
@@ -1017,7 +1017,7 @@ static int | |||
1017 | encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) | 1017 | encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) |
1018 | { | 1018 | { |
1019 | int len = fh->size; | 1019 | int len = fh->size; |
1020 | uint32_t *p; | 1020 | __be32 *p; |
1021 | 1021 | ||
1022 | RESERVE_SPACE(8 + len); | 1022 | RESERVE_SPACE(8 + len); |
1023 | WRITE32(OP_PUTFH); | 1023 | WRITE32(OP_PUTFH); |
@@ -1029,7 +1029,7 @@ encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) | |||
1029 | 1029 | ||
1030 | static int encode_putrootfh(struct xdr_stream *xdr) | 1030 | static int encode_putrootfh(struct xdr_stream *xdr) |
1031 | { | 1031 | { |
1032 | uint32_t *p; | 1032 | __be32 *p; |
1033 | 1033 | ||
1034 | RESERVE_SPACE(4); | 1034 | RESERVE_SPACE(4); |
1035 | WRITE32(OP_PUTROOTFH); | 1035 | WRITE32(OP_PUTROOTFH); |
@@ -1040,7 +1040,7 @@ static int encode_putrootfh(struct xdr_stream *xdr) | |||
1040 | static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx) | 1040 | static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx) |
1041 | { | 1041 | { |
1042 | nfs4_stateid stateid; | 1042 | nfs4_stateid stateid; |
1043 | uint32_t *p; | 1043 | __be32 *p; |
1044 | 1044 | ||
1045 | RESERVE_SPACE(16); | 1045 | RESERVE_SPACE(16); |
1046 | if (ctx->state != NULL) { | 1046 | if (ctx->state != NULL) { |
@@ -1052,7 +1052,7 @@ static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context | |||
1052 | 1052 | ||
1053 | static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args) | 1053 | static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args) |
1054 | { | 1054 | { |
1055 | uint32_t *p; | 1055 | __be32 *p; |
1056 | 1056 | ||
1057 | RESERVE_SPACE(4); | 1057 | RESERVE_SPACE(4); |
1058 | WRITE32(OP_READ); | 1058 | WRITE32(OP_READ); |
@@ -1074,7 +1074,7 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg | |||
1074 | FATTR4_WORD1_MOUNTED_ON_FILEID, | 1074 | FATTR4_WORD1_MOUNTED_ON_FILEID, |
1075 | }; | 1075 | }; |
1076 | int replen; | 1076 | int replen; |
1077 | uint32_t *p; | 1077 | __be32 *p; |
1078 | 1078 | ||
1079 | RESERVE_SPACE(32+sizeof(nfs4_verifier)); | 1079 | RESERVE_SPACE(32+sizeof(nfs4_verifier)); |
1080 | WRITE32(OP_READDIR); | 1080 | WRITE32(OP_READDIR); |
@@ -1116,7 +1116,7 @@ static int encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *r | |||
1116 | { | 1116 | { |
1117 | struct rpc_auth *auth = req->rq_task->tk_auth; | 1117 | struct rpc_auth *auth = req->rq_task->tk_auth; |
1118 | unsigned int replen; | 1118 | unsigned int replen; |
1119 | uint32_t *p; | 1119 | __be32 *p; |
1120 | 1120 | ||
1121 | RESERVE_SPACE(4); | 1121 | RESERVE_SPACE(4); |
1122 | WRITE32(OP_READLINK); | 1122 | WRITE32(OP_READLINK); |
@@ -1134,7 +1134,7 @@ static int encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *r | |||
1134 | 1134 | ||
1135 | static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) | 1135 | static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) |
1136 | { | 1136 | { |
1137 | uint32_t *p; | 1137 | __be32 *p; |
1138 | 1138 | ||
1139 | RESERVE_SPACE(8 + name->len); | 1139 | RESERVE_SPACE(8 + name->len); |
1140 | WRITE32(OP_REMOVE); | 1140 | WRITE32(OP_REMOVE); |
@@ -1146,7 +1146,7 @@ static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) | |||
1146 | 1146 | ||
1147 | static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname) | 1147 | static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname) |
1148 | { | 1148 | { |
1149 | uint32_t *p; | 1149 | __be32 *p; |
1150 | 1150 | ||
1151 | RESERVE_SPACE(8 + oldname->len); | 1151 | RESERVE_SPACE(8 + oldname->len); |
1152 | WRITE32(OP_RENAME); | 1152 | WRITE32(OP_RENAME); |
@@ -1162,7 +1162,7 @@ static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, con | |||
1162 | 1162 | ||
1163 | static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid) | 1163 | static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid) |
1164 | { | 1164 | { |
1165 | uint32_t *p; | 1165 | __be32 *p; |
1166 | 1166 | ||
1167 | RESERVE_SPACE(12); | 1167 | RESERVE_SPACE(12); |
1168 | WRITE32(OP_RENEW); | 1168 | WRITE32(OP_RENEW); |
@@ -1174,7 +1174,7 @@ static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_ | |||
1174 | static int | 1174 | static int |
1175 | encode_restorefh(struct xdr_stream *xdr) | 1175 | encode_restorefh(struct xdr_stream *xdr) |
1176 | { | 1176 | { |
1177 | uint32_t *p; | 1177 | __be32 *p; |
1178 | 1178 | ||
1179 | RESERVE_SPACE(4); | 1179 | RESERVE_SPACE(4); |
1180 | WRITE32(OP_RESTOREFH); | 1180 | WRITE32(OP_RESTOREFH); |
@@ -1185,7 +1185,7 @@ encode_restorefh(struct xdr_stream *xdr) | |||
1185 | static int | 1185 | static int |
1186 | encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) | 1186 | encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) |
1187 | { | 1187 | { |
1188 | uint32_t *p; | 1188 | __be32 *p; |
1189 | 1189 | ||
1190 | RESERVE_SPACE(4+sizeof(zero_stateid.data)); | 1190 | RESERVE_SPACE(4+sizeof(zero_stateid.data)); |
1191 | WRITE32(OP_SETATTR); | 1191 | WRITE32(OP_SETATTR); |
@@ -1204,7 +1204,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) | |||
1204 | static int | 1204 | static int |
1205 | encode_savefh(struct xdr_stream *xdr) | 1205 | encode_savefh(struct xdr_stream *xdr) |
1206 | { | 1206 | { |
1207 | uint32_t *p; | 1207 | __be32 *p; |
1208 | 1208 | ||
1209 | RESERVE_SPACE(4); | 1209 | RESERVE_SPACE(4); |
1210 | WRITE32(OP_SAVEFH); | 1210 | WRITE32(OP_SAVEFH); |
@@ -1215,7 +1215,7 @@ encode_savefh(struct xdr_stream *xdr) | |||
1215 | static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server) | 1215 | static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server) |
1216 | { | 1216 | { |
1217 | int status; | 1217 | int status; |
1218 | uint32_t *p; | 1218 | __be32 *p; |
1219 | 1219 | ||
1220 | RESERVE_SPACE(4+sizeof(arg->stateid.data)); | 1220 | RESERVE_SPACE(4+sizeof(arg->stateid.data)); |
1221 | WRITE32(OP_SETATTR); | 1221 | WRITE32(OP_SETATTR); |
@@ -1229,7 +1229,7 @@ static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs * | |||
1229 | 1229 | ||
1230 | static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid) | 1230 | static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid) |
1231 | { | 1231 | { |
1232 | uint32_t *p; | 1232 | __be32 *p; |
1233 | 1233 | ||
1234 | RESERVE_SPACE(4 + sizeof(setclientid->sc_verifier->data)); | 1234 | RESERVE_SPACE(4 + sizeof(setclientid->sc_verifier->data)); |
1235 | WRITE32(OP_SETCLIENTID); | 1235 | WRITE32(OP_SETCLIENTID); |
@@ -1248,7 +1248,7 @@ static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclien | |||
1248 | 1248 | ||
1249 | static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state) | 1249 | static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state) |
1250 | { | 1250 | { |
1251 | uint32_t *p; | 1251 | __be32 *p; |
1252 | 1252 | ||
1253 | RESERVE_SPACE(12 + sizeof(client_state->cl_confirm.data)); | 1253 | RESERVE_SPACE(12 + sizeof(client_state->cl_confirm.data)); |
1254 | WRITE32(OP_SETCLIENTID_CONFIRM); | 1254 | WRITE32(OP_SETCLIENTID_CONFIRM); |
@@ -1260,7 +1260,7 @@ static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_c | |||
1260 | 1260 | ||
1261 | static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args) | 1261 | static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args) |
1262 | { | 1262 | { |
1263 | uint32_t *p; | 1263 | __be32 *p; |
1264 | 1264 | ||
1265 | RESERVE_SPACE(4); | 1265 | RESERVE_SPACE(4); |
1266 | WRITE32(OP_WRITE); | 1266 | WRITE32(OP_WRITE); |
@@ -1279,7 +1279,7 @@ static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args | |||
1279 | 1279 | ||
1280 | static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid) | 1280 | static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid) |
1281 | { | 1281 | { |
1282 | uint32_t *p; | 1282 | __be32 *p; |
1283 | 1283 | ||
1284 | RESERVE_SPACE(20); | 1284 | RESERVE_SPACE(20); |
1285 | 1285 | ||
@@ -1295,7 +1295,7 @@ static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *statei | |||
1295 | /* | 1295 | /* |
1296 | * Encode an ACCESS request | 1296 | * Encode an ACCESS request |
1297 | */ | 1297 | */ |
1298 | static int nfs4_xdr_enc_access(struct rpc_rqst *req, uint32_t *p, const struct nfs4_accessargs *args) | 1298 | static int nfs4_xdr_enc_access(struct rpc_rqst *req, __be32 *p, const struct nfs4_accessargs *args) |
1299 | { | 1299 | { |
1300 | struct xdr_stream xdr; | 1300 | struct xdr_stream xdr; |
1301 | struct compound_hdr hdr = { | 1301 | struct compound_hdr hdr = { |
@@ -1313,7 +1313,7 @@ static int nfs4_xdr_enc_access(struct rpc_rqst *req, uint32_t *p, const struct n | |||
1313 | /* | 1313 | /* |
1314 | * Encode LOOKUP request | 1314 | * Encode LOOKUP request |
1315 | */ | 1315 | */ |
1316 | static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, uint32_t *p, const struct nfs4_lookup_arg *args) | 1316 | static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, __be32 *p, const struct nfs4_lookup_arg *args) |
1317 | { | 1317 | { |
1318 | struct xdr_stream xdr; | 1318 | struct xdr_stream xdr; |
1319 | struct compound_hdr hdr = { | 1319 | struct compound_hdr hdr = { |
@@ -1337,7 +1337,7 @@ out: | |||
1337 | /* | 1337 | /* |
1338 | * Encode LOOKUP_ROOT request | 1338 | * Encode LOOKUP_ROOT request |
1339 | */ | 1339 | */ |
1340 | static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, uint32_t *p, const struct nfs4_lookup_root_arg *args) | 1340 | static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, __be32 *p, const struct nfs4_lookup_root_arg *args) |
1341 | { | 1341 | { |
1342 | struct xdr_stream xdr; | 1342 | struct xdr_stream xdr; |
1343 | struct compound_hdr hdr = { | 1343 | struct compound_hdr hdr = { |
@@ -1358,7 +1358,7 @@ out: | |||
1358 | /* | 1358 | /* |
1359 | * Encode REMOVE request | 1359 | * Encode REMOVE request |
1360 | */ | 1360 | */ |
1361 | static int nfs4_xdr_enc_remove(struct rpc_rqst *req, uint32_t *p, const struct nfs4_remove_arg *args) | 1361 | static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs4_remove_arg *args) |
1362 | { | 1362 | { |
1363 | struct xdr_stream xdr; | 1363 | struct xdr_stream xdr; |
1364 | struct compound_hdr hdr = { | 1364 | struct compound_hdr hdr = { |
@@ -1380,7 +1380,7 @@ out: | |||
1380 | /* | 1380 | /* |
1381 | * Encode RENAME request | 1381 | * Encode RENAME request |
1382 | */ | 1382 | */ |
1383 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, uint32_t *p, const struct nfs4_rename_arg *args) | 1383 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs4_rename_arg *args) |
1384 | { | 1384 | { |
1385 | struct xdr_stream xdr; | 1385 | struct xdr_stream xdr; |
1386 | struct compound_hdr hdr = { | 1386 | struct compound_hdr hdr = { |
@@ -1410,7 +1410,7 @@ out: | |||
1410 | /* | 1410 | /* |
1411 | * Encode LINK request | 1411 | * Encode LINK request |
1412 | */ | 1412 | */ |
1413 | static int nfs4_xdr_enc_link(struct rpc_rqst *req, uint32_t *p, const struct nfs4_link_arg *args) | 1413 | static int nfs4_xdr_enc_link(struct rpc_rqst *req, __be32 *p, const struct nfs4_link_arg *args) |
1414 | { | 1414 | { |
1415 | struct xdr_stream xdr; | 1415 | struct xdr_stream xdr; |
1416 | struct compound_hdr hdr = { | 1416 | struct compound_hdr hdr = { |
@@ -1440,7 +1440,7 @@ out: | |||
1440 | /* | 1440 | /* |
1441 | * Encode CREATE request | 1441 | * Encode CREATE request |
1442 | */ | 1442 | */ |
1443 | static int nfs4_xdr_enc_create(struct rpc_rqst *req, uint32_t *p, const struct nfs4_create_arg *args) | 1443 | static int nfs4_xdr_enc_create(struct rpc_rqst *req, __be32 *p, const struct nfs4_create_arg *args) |
1444 | { | 1444 | { |
1445 | struct xdr_stream xdr; | 1445 | struct xdr_stream xdr; |
1446 | struct compound_hdr hdr = { | 1446 | struct compound_hdr hdr = { |
@@ -1470,7 +1470,7 @@ out: | |||
1470 | /* | 1470 | /* |
1471 | * Encode SYMLINK request | 1471 | * Encode SYMLINK request |
1472 | */ | 1472 | */ |
1473 | static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, uint32_t *p, const struct nfs4_create_arg *args) | 1473 | static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, __be32 *p, const struct nfs4_create_arg *args) |
1474 | { | 1474 | { |
1475 | return nfs4_xdr_enc_create(req, p, args); | 1475 | return nfs4_xdr_enc_create(req, p, args); |
1476 | } | 1476 | } |
@@ -1478,7 +1478,7 @@ static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, uint32_t *p, const struct | |||
1478 | /* | 1478 | /* |
1479 | * Encode GETATTR request | 1479 | * Encode GETATTR request |
1480 | */ | 1480 | */ |
1481 | static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, uint32_t *p, const struct nfs4_getattr_arg *args) | 1481 | static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, __be32 *p, const struct nfs4_getattr_arg *args) |
1482 | { | 1482 | { |
1483 | struct xdr_stream xdr; | 1483 | struct xdr_stream xdr; |
1484 | struct compound_hdr hdr = { | 1484 | struct compound_hdr hdr = { |
@@ -1496,7 +1496,7 @@ static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, uint32_t *p, const struct | |||
1496 | /* | 1496 | /* |
1497 | * Encode a CLOSE request | 1497 | * Encode a CLOSE request |
1498 | */ | 1498 | */ |
1499 | static int nfs4_xdr_enc_close(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args) | 1499 | static int nfs4_xdr_enc_close(struct rpc_rqst *req, __be32 *p, struct nfs_closeargs *args) |
1500 | { | 1500 | { |
1501 | struct xdr_stream xdr; | 1501 | struct xdr_stream xdr; |
1502 | struct compound_hdr hdr = { | 1502 | struct compound_hdr hdr = { |
@@ -1520,7 +1520,7 @@ out: | |||
1520 | /* | 1520 | /* |
1521 | * Encode an OPEN request | 1521 | * Encode an OPEN request |
1522 | */ | 1522 | */ |
1523 | static int nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args) | 1523 | static int nfs4_xdr_enc_open(struct rpc_rqst *req, __be32 *p, struct nfs_openargs *args) |
1524 | { | 1524 | { |
1525 | struct xdr_stream xdr; | 1525 | struct xdr_stream xdr; |
1526 | struct compound_hdr hdr = { | 1526 | struct compound_hdr hdr = { |
@@ -1556,7 +1556,7 @@ out: | |||
1556 | /* | 1556 | /* |
1557 | * Encode an OPEN_CONFIRM request | 1557 | * Encode an OPEN_CONFIRM request |
1558 | */ | 1558 | */ |
1559 | static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_open_confirmargs *args) | 1559 | static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_open_confirmargs *args) |
1560 | { | 1560 | { |
1561 | struct xdr_stream xdr; | 1561 | struct xdr_stream xdr; |
1562 | struct compound_hdr hdr = { | 1562 | struct compound_hdr hdr = { |
@@ -1577,7 +1577,7 @@ out: | |||
1577 | /* | 1577 | /* |
1578 | * Encode an OPEN request with no attributes. | 1578 | * Encode an OPEN request with no attributes. |
1579 | */ | 1579 | */ |
1580 | static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args) | 1580 | static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, __be32 *p, struct nfs_openargs *args) |
1581 | { | 1581 | { |
1582 | struct xdr_stream xdr; | 1582 | struct xdr_stream xdr; |
1583 | struct compound_hdr hdr = { | 1583 | struct compound_hdr hdr = { |
@@ -1601,7 +1601,7 @@ out: | |||
1601 | /* | 1601 | /* |
1602 | * Encode an OPEN_DOWNGRADE request | 1602 | * Encode an OPEN_DOWNGRADE request |
1603 | */ | 1603 | */ |
1604 | static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args) | 1604 | static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, __be32 *p, struct nfs_closeargs *args) |
1605 | { | 1605 | { |
1606 | struct xdr_stream xdr; | 1606 | struct xdr_stream xdr; |
1607 | struct compound_hdr hdr = { | 1607 | struct compound_hdr hdr = { |
@@ -1625,7 +1625,7 @@ out: | |||
1625 | /* | 1625 | /* |
1626 | * Encode a LOCK request | 1626 | * Encode a LOCK request |
1627 | */ | 1627 | */ |
1628 | static int nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lock_args *args) | 1628 | static int nfs4_xdr_enc_lock(struct rpc_rqst *req, __be32 *p, struct nfs_lock_args *args) |
1629 | { | 1629 | { |
1630 | struct xdr_stream xdr; | 1630 | struct xdr_stream xdr; |
1631 | struct compound_hdr hdr = { | 1631 | struct compound_hdr hdr = { |
@@ -1646,7 +1646,7 @@ out: | |||
1646 | /* | 1646 | /* |
1647 | * Encode a LOCKT request | 1647 | * Encode a LOCKT request |
1648 | */ | 1648 | */ |
1649 | static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockt_args *args) | 1649 | static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, __be32 *p, struct nfs_lockt_args *args) |
1650 | { | 1650 | { |
1651 | struct xdr_stream xdr; | 1651 | struct xdr_stream xdr; |
1652 | struct compound_hdr hdr = { | 1652 | struct compound_hdr hdr = { |
@@ -1667,7 +1667,7 @@ out: | |||
1667 | /* | 1667 | /* |
1668 | * Encode a LOCKU request | 1668 | * Encode a LOCKU request |
1669 | */ | 1669 | */ |
1670 | static int nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_locku_args *args) | 1670 | static int nfs4_xdr_enc_locku(struct rpc_rqst *req, __be32 *p, struct nfs_locku_args *args) |
1671 | { | 1671 | { |
1672 | struct xdr_stream xdr; | 1672 | struct xdr_stream xdr; |
1673 | struct compound_hdr hdr = { | 1673 | struct compound_hdr hdr = { |
@@ -1688,7 +1688,7 @@ out: | |||
1688 | /* | 1688 | /* |
1689 | * Encode a READLINK request | 1689 | * Encode a READLINK request |
1690 | */ | 1690 | */ |
1691 | static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, uint32_t *p, const struct nfs4_readlink *args) | 1691 | static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, __be32 *p, const struct nfs4_readlink *args) |
1692 | { | 1692 | { |
1693 | struct xdr_stream xdr; | 1693 | struct xdr_stream xdr; |
1694 | struct compound_hdr hdr = { | 1694 | struct compound_hdr hdr = { |
@@ -1709,7 +1709,7 @@ out: | |||
1709 | /* | 1709 | /* |
1710 | * Encode a READDIR request | 1710 | * Encode a READDIR request |
1711 | */ | 1711 | */ |
1712 | static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, uint32_t *p, const struct nfs4_readdir_arg *args) | 1712 | static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nfs4_readdir_arg *args) |
1713 | { | 1713 | { |
1714 | struct xdr_stream xdr; | 1714 | struct xdr_stream xdr; |
1715 | struct compound_hdr hdr = { | 1715 | struct compound_hdr hdr = { |
@@ -1730,7 +1730,7 @@ out: | |||
1730 | /* | 1730 | /* |
1731 | * Encode a READ request | 1731 | * Encode a READ request |
1732 | */ | 1732 | */ |
1733 | static int nfs4_xdr_enc_read(struct rpc_rqst *req, uint32_t *p, struct nfs_readargs *args) | 1733 | static int nfs4_xdr_enc_read(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args) |
1734 | { | 1734 | { |
1735 | struct rpc_auth *auth = req->rq_task->tk_auth; | 1735 | struct rpc_auth *auth = req->rq_task->tk_auth; |
1736 | struct xdr_stream xdr; | 1736 | struct xdr_stream xdr; |
@@ -1762,7 +1762,7 @@ out: | |||
1762 | /* | 1762 | /* |
1763 | * Encode an SETATTR request | 1763 | * Encode an SETATTR request |
1764 | */ | 1764 | */ |
1765 | static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, uint32_t *p, struct nfs_setattrargs *args) | 1765 | static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, __be32 *p, struct nfs_setattrargs *args) |
1766 | 1766 | ||
1767 | { | 1767 | { |
1768 | struct xdr_stream xdr; | 1768 | struct xdr_stream xdr; |
@@ -1788,7 +1788,7 @@ out: | |||
1788 | * Encode a GETACL request | 1788 | * Encode a GETACL request |
1789 | */ | 1789 | */ |
1790 | static int | 1790 | static int |
1791 | nfs4_xdr_enc_getacl(struct rpc_rqst *req, uint32_t *p, | 1791 | nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p, |
1792 | struct nfs_getaclargs *args) | 1792 | struct nfs_getaclargs *args) |
1793 | { | 1793 | { |
1794 | struct xdr_stream xdr; | 1794 | struct xdr_stream xdr; |
@@ -1815,7 +1815,7 @@ out: | |||
1815 | /* | 1815 | /* |
1816 | * Encode a WRITE request | 1816 | * Encode a WRITE request |
1817 | */ | 1817 | */ |
1818 | static int nfs4_xdr_enc_write(struct rpc_rqst *req, uint32_t *p, struct nfs_writeargs *args) | 1818 | static int nfs4_xdr_enc_write(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
1819 | { | 1819 | { |
1820 | struct xdr_stream xdr; | 1820 | struct xdr_stream xdr; |
1821 | struct compound_hdr hdr = { | 1821 | struct compound_hdr hdr = { |
@@ -1839,7 +1839,7 @@ out: | |||
1839 | /* | 1839 | /* |
1840 | * a COMMIT request | 1840 | * a COMMIT request |
1841 | */ | 1841 | */ |
1842 | static int nfs4_xdr_enc_commit(struct rpc_rqst *req, uint32_t *p, struct nfs_writeargs *args) | 1842 | static int nfs4_xdr_enc_commit(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
1843 | { | 1843 | { |
1844 | struct xdr_stream xdr; | 1844 | struct xdr_stream xdr; |
1845 | struct compound_hdr hdr = { | 1845 | struct compound_hdr hdr = { |
@@ -1863,7 +1863,7 @@ out: | |||
1863 | /* | 1863 | /* |
1864 | * FSINFO request | 1864 | * FSINFO request |
1865 | */ | 1865 | */ |
1866 | static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fsinfo_arg *args) | 1866 | static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs4_fsinfo_arg *args) |
1867 | { | 1867 | { |
1868 | struct xdr_stream xdr; | 1868 | struct xdr_stream xdr; |
1869 | struct compound_hdr hdr = { | 1869 | struct compound_hdr hdr = { |
@@ -1882,7 +1882,7 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs | |||
1882 | /* | 1882 | /* |
1883 | * a PATHCONF request | 1883 | * a PATHCONF request |
1884 | */ | 1884 | */ |
1885 | static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct nfs4_pathconf_arg *args) | 1885 | static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, __be32 *p, const struct nfs4_pathconf_arg *args) |
1886 | { | 1886 | { |
1887 | struct xdr_stream xdr; | 1887 | struct xdr_stream xdr; |
1888 | struct compound_hdr hdr = { | 1888 | struct compound_hdr hdr = { |
@@ -1902,7 +1902,7 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct | |||
1902 | /* | 1902 | /* |
1903 | * a STATFS request | 1903 | * a STATFS request |
1904 | */ | 1904 | */ |
1905 | static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct nfs4_statfs_arg *args) | 1905 | static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, __be32 *p, const struct nfs4_statfs_arg *args) |
1906 | { | 1906 | { |
1907 | struct xdr_stream xdr; | 1907 | struct xdr_stream xdr; |
1908 | struct compound_hdr hdr = { | 1908 | struct compound_hdr hdr = { |
@@ -1923,7 +1923,7 @@ static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct n | |||
1923 | /* | 1923 | /* |
1924 | * GETATTR_BITMAP request | 1924 | * GETATTR_BITMAP request |
1925 | */ | 1925 | */ |
1926 | static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const struct nfs_fh *fhandle) | 1926 | static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, __be32 *p, const struct nfs_fh *fhandle) |
1927 | { | 1927 | { |
1928 | struct xdr_stream xdr; | 1928 | struct xdr_stream xdr; |
1929 | struct compound_hdr hdr = { | 1929 | struct compound_hdr hdr = { |
@@ -1945,7 +1945,7 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const str | |||
1945 | /* | 1945 | /* |
1946 | * a RENEW request | 1946 | * a RENEW request |
1947 | */ | 1947 | */ |
1948 | static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp) | 1948 | static int nfs4_xdr_enc_renew(struct rpc_rqst *req, __be32 *p, struct nfs_client *clp) |
1949 | { | 1949 | { |
1950 | struct xdr_stream xdr; | 1950 | struct xdr_stream xdr; |
1951 | struct compound_hdr hdr = { | 1951 | struct compound_hdr hdr = { |
@@ -1960,7 +1960,7 @@ static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs_clie | |||
1960 | /* | 1960 | /* |
1961 | * a SETCLIENTID request | 1961 | * a SETCLIENTID request |
1962 | */ | 1962 | */ |
1963 | static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nfs4_setclientid *sc) | 1963 | static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, __be32 *p, struct nfs4_setclientid *sc) |
1964 | { | 1964 | { |
1965 | struct xdr_stream xdr; | 1965 | struct xdr_stream xdr; |
1966 | struct compound_hdr hdr = { | 1966 | struct compound_hdr hdr = { |
@@ -1975,7 +1975,7 @@ static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nf | |||
1975 | /* | 1975 | /* |
1976 | * a SETCLIENTID_CONFIRM request | 1976 | * a SETCLIENTID_CONFIRM request |
1977 | */ | 1977 | */ |
1978 | static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp) | 1978 | static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_client *clp) |
1979 | { | 1979 | { |
1980 | struct xdr_stream xdr; | 1980 | struct xdr_stream xdr; |
1981 | struct compound_hdr hdr = { | 1981 | struct compound_hdr hdr = { |
@@ -1997,7 +1997,7 @@ static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, s | |||
1997 | /* | 1997 | /* |
1998 | * DELEGRETURN request | 1998 | * DELEGRETURN request |
1999 | */ | 1999 | */ |
2000 | static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, uint32_t *p, const struct nfs4_delegreturnargs *args) | 2000 | static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, __be32 *p, const struct nfs4_delegreturnargs *args) |
2001 | { | 2001 | { |
2002 | struct xdr_stream xdr; | 2002 | struct xdr_stream xdr; |
2003 | struct compound_hdr hdr = { | 2003 | struct compound_hdr hdr = { |
@@ -2021,7 +2021,7 @@ out: | |||
2021 | /* | 2021 | /* |
2022 | * Encode FS_LOCATIONS request | 2022 | * Encode FS_LOCATIONS request |
2023 | */ | 2023 | */ |
2024 | static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations_arg *args) | 2024 | static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs4_fs_locations_arg *args) |
2025 | { | 2025 | { |
2026 | struct xdr_stream xdr; | 2026 | struct xdr_stream xdr; |
2027 | struct compound_hdr hdr = { | 2027 | struct compound_hdr hdr = { |
@@ -2086,7 +2086,7 @@ out: | |||
2086 | 2086 | ||
2087 | static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string) | 2087 | static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string) |
2088 | { | 2088 | { |
2089 | uint32_t *p; | 2089 | __be32 *p; |
2090 | 2090 | ||
2091 | READ_BUF(4); | 2091 | READ_BUF(4); |
2092 | READ32(*len); | 2092 | READ32(*len); |
@@ -2097,7 +2097,7 @@ static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char | |||
2097 | 2097 | ||
2098 | static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | 2098 | static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) |
2099 | { | 2099 | { |
2100 | uint32_t *p; | 2100 | __be32 *p; |
2101 | 2101 | ||
2102 | READ_BUF(8); | 2102 | READ_BUF(8); |
2103 | READ32(hdr->status); | 2103 | READ32(hdr->status); |
@@ -2112,7 +2112,7 @@ static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
2112 | 2112 | ||
2113 | static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | 2113 | static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) |
2114 | { | 2114 | { |
2115 | uint32_t *p; | 2115 | __be32 *p; |
2116 | uint32_t opnum; | 2116 | uint32_t opnum; |
2117 | int32_t nfserr; | 2117 | int32_t nfserr; |
2118 | 2118 | ||
@@ -2134,7 +2134,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | |||
2134 | /* Dummy routine */ | 2134 | /* Dummy routine */ |
2135 | static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) | 2135 | static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) |
2136 | { | 2136 | { |
2137 | uint32_t *p; | 2137 | __be32 *p; |
2138 | unsigned int strlen; | 2138 | unsigned int strlen; |
2139 | char *str; | 2139 | char *str; |
2140 | 2140 | ||
@@ -2144,7 +2144,8 @@ static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) | |||
2144 | 2144 | ||
2145 | static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | 2145 | static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) |
2146 | { | 2146 | { |
2147 | uint32_t bmlen, *p; | 2147 | uint32_t bmlen; |
2148 | __be32 *p; | ||
2148 | 2149 | ||
2149 | READ_BUF(4); | 2150 | READ_BUF(4); |
2150 | READ32(bmlen); | 2151 | READ32(bmlen); |
@@ -2159,9 +2160,9 @@ static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | |||
2159 | return 0; | 2160 | return 0; |
2160 | } | 2161 | } |
2161 | 2162 | ||
2162 | static inline int decode_attr_length(struct xdr_stream *xdr, uint32_t *attrlen, uint32_t **savep) | 2163 | static inline int decode_attr_length(struct xdr_stream *xdr, uint32_t *attrlen, __be32 **savep) |
2163 | { | 2164 | { |
2164 | uint32_t *p; | 2165 | __be32 *p; |
2165 | 2166 | ||
2166 | READ_BUF(4); | 2167 | READ_BUF(4); |
2167 | READ32(*attrlen); | 2168 | READ32(*attrlen); |
@@ -2182,7 +2183,7 @@ static int decode_attr_supported(struct xdr_stream *xdr, uint32_t *bitmap, uint3 | |||
2182 | 2183 | ||
2183 | static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *type) | 2184 | static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *type) |
2184 | { | 2185 | { |
2185 | uint32_t *p; | 2186 | __be32 *p; |
2186 | 2187 | ||
2187 | *type = 0; | 2188 | *type = 0; |
2188 | if (unlikely(bitmap[0] & (FATTR4_WORD0_TYPE - 1U))) | 2189 | if (unlikely(bitmap[0] & (FATTR4_WORD0_TYPE - 1U))) |
@@ -2202,7 +2203,7 @@ static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * | |||
2202 | 2203 | ||
2203 | static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *change) | 2204 | static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *change) |
2204 | { | 2205 | { |
2205 | uint32_t *p; | 2206 | __be32 *p; |
2206 | 2207 | ||
2207 | *change = 0; | 2208 | *change = 0; |
2208 | if (unlikely(bitmap[0] & (FATTR4_WORD0_CHANGE - 1U))) | 2209 | if (unlikely(bitmap[0] & (FATTR4_WORD0_CHANGE - 1U))) |
@@ -2219,7 +2220,7 @@ static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t | |||
2219 | 2220 | ||
2220 | static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *size) | 2221 | static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *size) |
2221 | { | 2222 | { |
2222 | uint32_t *p; | 2223 | __be32 *p; |
2223 | 2224 | ||
2224 | *size = 0; | 2225 | *size = 0; |
2225 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SIZE - 1U))) | 2226 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SIZE - 1U))) |
@@ -2235,7 +2236,7 @@ static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t * | |||
2235 | 2236 | ||
2236 | static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2237 | static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2237 | { | 2238 | { |
2238 | uint32_t *p; | 2239 | __be32 *p; |
2239 | 2240 | ||
2240 | *res = 0; | 2241 | *res = 0; |
2241 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LINK_SUPPORT - 1U))) | 2242 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LINK_SUPPORT - 1U))) |
@@ -2251,7 +2252,7 @@ static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, ui | |||
2251 | 2252 | ||
2252 | static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2253 | static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2253 | { | 2254 | { |
2254 | uint32_t *p; | 2255 | __be32 *p; |
2255 | 2256 | ||
2256 | *res = 0; | 2257 | *res = 0; |
2257 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SYMLINK_SUPPORT - 1U))) | 2258 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SYMLINK_SUPPORT - 1U))) |
@@ -2267,7 +2268,7 @@ static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, | |||
2267 | 2268 | ||
2268 | static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_fsid *fsid) | 2269 | static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_fsid *fsid) |
2269 | { | 2270 | { |
2270 | uint32_t *p; | 2271 | __be32 *p; |
2271 | 2272 | ||
2272 | fsid->major = 0; | 2273 | fsid->major = 0; |
2273 | fsid->minor = 0; | 2274 | fsid->minor = 0; |
@@ -2287,7 +2288,7 @@ static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs | |||
2287 | 2288 | ||
2288 | static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2289 | static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2289 | { | 2290 | { |
2290 | uint32_t *p; | 2291 | __be32 *p; |
2291 | 2292 | ||
2292 | *res = 60; | 2293 | *res = 60; |
2293 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LEASE_TIME - 1U))) | 2294 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LEASE_TIME - 1U))) |
@@ -2303,7 +2304,7 @@ static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
2303 | 2304 | ||
2304 | static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2305 | static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2305 | { | 2306 | { |
2306 | uint32_t *p; | 2307 | __be32 *p; |
2307 | 2308 | ||
2308 | *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL; | 2309 | *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL; |
2309 | if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U))) | 2310 | if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U))) |
@@ -2319,7 +2320,7 @@ static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
2319 | 2320 | ||
2320 | static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) | 2321 | static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) |
2321 | { | 2322 | { |
2322 | uint32_t *p; | 2323 | __be32 *p; |
2323 | 2324 | ||
2324 | *fileid = 0; | 2325 | *fileid = 0; |
2325 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FILEID - 1U))) | 2326 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FILEID - 1U))) |
@@ -2335,7 +2336,7 @@ static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t | |||
2335 | 2336 | ||
2336 | static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) | 2337 | static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) |
2337 | { | 2338 | { |
2338 | uint32_t *p; | 2339 | __be32 *p; |
2339 | 2340 | ||
2340 | *fileid = 0; | 2341 | *fileid = 0; |
2341 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MOUNTED_ON_FILEID - 1U))) | 2342 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MOUNTED_ON_FILEID - 1U))) |
@@ -2351,7 +2352,7 @@ static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitma | |||
2351 | 2352 | ||
2352 | static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2353 | static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2353 | { | 2354 | { |
2354 | uint32_t *p; | 2355 | __be32 *p; |
2355 | int status = 0; | 2356 | int status = 0; |
2356 | 2357 | ||
2357 | *res = 0; | 2358 | *res = 0; |
@@ -2368,7 +2369,7 @@ static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
2368 | 2369 | ||
2369 | static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2370 | static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2370 | { | 2371 | { |
2371 | uint32_t *p; | 2372 | __be32 *p; |
2372 | int status = 0; | 2373 | int status = 0; |
2373 | 2374 | ||
2374 | *res = 0; | 2375 | *res = 0; |
@@ -2385,7 +2386,7 @@ static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
2385 | 2386 | ||
2386 | static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2387 | static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2387 | { | 2388 | { |
2388 | uint32_t *p; | 2389 | __be32 *p; |
2389 | int status = 0; | 2390 | int status = 0; |
2390 | 2391 | ||
2391 | *res = 0; | 2392 | *res = 0; |
@@ -2403,7 +2404,7 @@ static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
2403 | static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path) | 2404 | static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path) |
2404 | { | 2405 | { |
2405 | int n; | 2406 | int n; |
2406 | uint32_t *p; | 2407 | __be32 *p; |
2407 | int status = 0; | 2408 | int status = 0; |
2408 | 2409 | ||
2409 | READ_BUF(4); | 2410 | READ_BUF(4); |
@@ -2448,7 +2449,7 @@ out_eio: | |||
2448 | static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res) | 2449 | static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res) |
2449 | { | 2450 | { |
2450 | int n; | 2451 | int n; |
2451 | uint32_t *p; | 2452 | __be32 *p; |
2452 | int status = -EIO; | 2453 | int status = -EIO; |
2453 | 2454 | ||
2454 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FS_LOCATIONS -1U))) | 2455 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FS_LOCATIONS -1U))) |
@@ -2512,7 +2513,7 @@ out_eio: | |||
2512 | 2513 | ||
2513 | static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2514 | static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2514 | { | 2515 | { |
2515 | uint32_t *p; | 2516 | __be32 *p; |
2516 | int status = 0; | 2517 | int status = 0; |
2517 | 2518 | ||
2518 | *res = 0; | 2519 | *res = 0; |
@@ -2529,7 +2530,7 @@ static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
2529 | 2530 | ||
2530 | static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxlink) | 2531 | static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxlink) |
2531 | { | 2532 | { |
2532 | uint32_t *p; | 2533 | __be32 *p; |
2533 | int status = 0; | 2534 | int status = 0; |
2534 | 2535 | ||
2535 | *maxlink = 1; | 2536 | *maxlink = 1; |
@@ -2546,7 +2547,7 @@ static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
2546 | 2547 | ||
2547 | static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxname) | 2548 | static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxname) |
2548 | { | 2549 | { |
2549 | uint32_t *p; | 2550 | __be32 *p; |
2550 | int status = 0; | 2551 | int status = 0; |
2551 | 2552 | ||
2552 | *maxname = 1024; | 2553 | *maxname = 1024; |
@@ -2563,7 +2564,7 @@ static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
2563 | 2564 | ||
2564 | static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2565 | static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2565 | { | 2566 | { |
2566 | uint32_t *p; | 2567 | __be32 *p; |
2567 | int status = 0; | 2568 | int status = 0; |
2568 | 2569 | ||
2569 | *res = 1024; | 2570 | *res = 1024; |
@@ -2584,7 +2585,7 @@ static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
2584 | 2585 | ||
2585 | static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2586 | static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
2586 | { | 2587 | { |
2587 | uint32_t *p; | 2588 | __be32 *p; |
2588 | int status = 0; | 2589 | int status = 0; |
2589 | 2590 | ||
2590 | *res = 1024; | 2591 | *res = 1024; |
@@ -2605,7 +2606,7 @@ static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32 | |||
2605 | 2606 | ||
2606 | static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *mode) | 2607 | static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *mode) |
2607 | { | 2608 | { |
2608 | uint32_t *p; | 2609 | __be32 *p; |
2609 | 2610 | ||
2610 | *mode = 0; | 2611 | *mode = 0; |
2611 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MODE - 1U))) | 2612 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MODE - 1U))) |
@@ -2622,7 +2623,7 @@ static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * | |||
2622 | 2623 | ||
2623 | static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *nlink) | 2624 | static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *nlink) |
2624 | { | 2625 | { |
2625 | uint32_t *p; | 2626 | __be32 *p; |
2626 | 2627 | ||
2627 | *nlink = 1; | 2628 | *nlink = 1; |
2628 | if (unlikely(bitmap[1] & (FATTR4_WORD1_NUMLINKS - 1U))) | 2629 | if (unlikely(bitmap[1] & (FATTR4_WORD1_NUMLINKS - 1U))) |
@@ -2638,7 +2639,8 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t | |||
2638 | 2639 | ||
2639 | static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid) | 2640 | static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid) |
2640 | { | 2641 | { |
2641 | uint32_t len, *p; | 2642 | uint32_t len; |
2643 | __be32 *p; | ||
2642 | 2644 | ||
2643 | *uid = -2; | 2645 | *uid = -2; |
2644 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U))) | 2646 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U))) |
@@ -2662,7 +2664,8 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nf | |||
2662 | 2664 | ||
2663 | static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid) | 2665 | static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid) |
2664 | { | 2666 | { |
2665 | uint32_t len, *p; | 2667 | uint32_t len; |
2668 | __be32 *p; | ||
2666 | 2669 | ||
2667 | *gid = -2; | 2670 | *gid = -2; |
2668 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U))) | 2671 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U))) |
@@ -2686,7 +2689,8 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nf | |||
2686 | 2689 | ||
2687 | static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rdev) | 2690 | static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rdev) |
2688 | { | 2691 | { |
2689 | uint32_t major = 0, minor = 0, *p; | 2692 | uint32_t major = 0, minor = 0; |
2693 | __be32 *p; | ||
2690 | 2694 | ||
2691 | *rdev = MKDEV(0,0); | 2695 | *rdev = MKDEV(0,0); |
2692 | if (unlikely(bitmap[1] & (FATTR4_WORD1_RAWDEV - 1U))) | 2696 | if (unlikely(bitmap[1] & (FATTR4_WORD1_RAWDEV - 1U))) |
@@ -2708,7 +2712,7 @@ static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rde | |||
2708 | 2712 | ||
2709 | static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2713 | static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2710 | { | 2714 | { |
2711 | uint32_t *p; | 2715 | __be32 *p; |
2712 | int status = 0; | 2716 | int status = 0; |
2713 | 2717 | ||
2714 | *res = 0; | 2718 | *res = 0; |
@@ -2725,7 +2729,7 @@ static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
2725 | 2729 | ||
2726 | static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2730 | static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2727 | { | 2731 | { |
2728 | uint32_t *p; | 2732 | __be32 *p; |
2729 | int status = 0; | 2733 | int status = 0; |
2730 | 2734 | ||
2731 | *res = 0; | 2735 | *res = 0; |
@@ -2742,7 +2746,7 @@ static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
2742 | 2746 | ||
2743 | static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2747 | static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
2744 | { | 2748 | { |
2745 | uint32_t *p; | 2749 | __be32 *p; |
2746 | int status = 0; | 2750 | int status = 0; |
2747 | 2751 | ||
2748 | *res = 0; | 2752 | *res = 0; |
@@ -2759,7 +2763,7 @@ static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
2759 | 2763 | ||
2760 | static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *used) | 2764 | static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *used) |
2761 | { | 2765 | { |
2762 | uint32_t *p; | 2766 | __be32 *p; |
2763 | 2767 | ||
2764 | *used = 0; | 2768 | *used = 0; |
2765 | if (unlikely(bitmap[1] & (FATTR4_WORD1_SPACE_USED - 1U))) | 2769 | if (unlikely(bitmap[1] & (FATTR4_WORD1_SPACE_USED - 1U))) |
@@ -2776,7 +2780,7 @@ static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
2776 | 2780 | ||
2777 | static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time) | 2781 | static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time) |
2778 | { | 2782 | { |
2779 | uint32_t *p; | 2783 | __be32 *p; |
2780 | uint64_t sec; | 2784 | uint64_t sec; |
2781 | uint32_t nsec; | 2785 | uint32_t nsec; |
2782 | 2786 | ||
@@ -2836,7 +2840,7 @@ static int decode_attr_time_modify(struct xdr_stream *xdr, uint32_t *bitmap, str | |||
2836 | return status; | 2840 | return status; |
2837 | } | 2841 | } |
2838 | 2842 | ||
2839 | static int verify_attr_len(struct xdr_stream *xdr, uint32_t *savep, uint32_t attrlen) | 2843 | static int verify_attr_len(struct xdr_stream *xdr, __be32 *savep, uint32_t attrlen) |
2840 | { | 2844 | { |
2841 | unsigned int attrwords = XDR_QUADLEN(attrlen); | 2845 | unsigned int attrwords = XDR_QUADLEN(attrlen); |
2842 | unsigned int nwords = xdr->p - savep; | 2846 | unsigned int nwords = xdr->p - savep; |
@@ -2854,7 +2858,7 @@ static int verify_attr_len(struct xdr_stream *xdr, uint32_t *savep, uint32_t att | |||
2854 | 2858 | ||
2855 | static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | 2859 | static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) |
2856 | { | 2860 | { |
2857 | uint32_t *p; | 2861 | __be32 *p; |
2858 | 2862 | ||
2859 | READ_BUF(20); | 2863 | READ_BUF(20); |
2860 | READ32(cinfo->atomic); | 2864 | READ32(cinfo->atomic); |
@@ -2865,7 +2869,7 @@ static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *c | |||
2865 | 2869 | ||
2866 | static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) | 2870 | static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) |
2867 | { | 2871 | { |
2868 | uint32_t *p; | 2872 | __be32 *p; |
2869 | uint32_t supp, acc; | 2873 | uint32_t supp, acc; |
2870 | int status; | 2874 | int status; |
2871 | 2875 | ||
@@ -2882,7 +2886,7 @@ static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) | |||
2882 | 2886 | ||
2883 | static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) | 2887 | static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) |
2884 | { | 2888 | { |
2885 | uint32_t *p; | 2889 | __be32 *p; |
2886 | int status; | 2890 | int status; |
2887 | 2891 | ||
2888 | status = decode_op_hdr(xdr, OP_CLOSE); | 2892 | status = decode_op_hdr(xdr, OP_CLOSE); |
@@ -2895,7 +2899,7 @@ static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) | |||
2895 | 2899 | ||
2896 | static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) | 2900 | static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) |
2897 | { | 2901 | { |
2898 | uint32_t *p; | 2902 | __be32 *p; |
2899 | int status; | 2903 | int status; |
2900 | 2904 | ||
2901 | status = decode_op_hdr(xdr, OP_COMMIT); | 2905 | status = decode_op_hdr(xdr, OP_COMMIT); |
@@ -2908,7 +2912,7 @@ static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) | |||
2908 | 2912 | ||
2909 | static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | 2913 | static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) |
2910 | { | 2914 | { |
2911 | uint32_t *p; | 2915 | __be32 *p; |
2912 | uint32_t bmlen; | 2916 | uint32_t bmlen; |
2913 | int status; | 2917 | int status; |
2914 | 2918 | ||
@@ -2925,7 +2929,7 @@ static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | |||
2925 | 2929 | ||
2926 | static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_res *res) | 2930 | static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_res *res) |
2927 | { | 2931 | { |
2928 | uint32_t *savep; | 2932 | __be32 *savep; |
2929 | uint32_t attrlen, | 2933 | uint32_t attrlen, |
2930 | bitmap[2] = {0}; | 2934 | bitmap[2] = {0}; |
2931 | int status; | 2935 | int status; |
@@ -2952,7 +2956,7 @@ xdr_error: | |||
2952 | 2956 | ||
2953 | static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) | 2957 | static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) |
2954 | { | 2958 | { |
2955 | uint32_t *savep; | 2959 | __be32 *savep; |
2956 | uint32_t attrlen, | 2960 | uint32_t attrlen, |
2957 | bitmap[2] = {0}; | 2961 | bitmap[2] = {0}; |
2958 | int status; | 2962 | int status; |
@@ -2985,7 +2989,7 @@ xdr_error: | |||
2985 | 2989 | ||
2986 | static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf) | 2990 | static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf) |
2987 | { | 2991 | { |
2988 | uint32_t *savep; | 2992 | __be32 *savep; |
2989 | uint32_t attrlen, | 2993 | uint32_t attrlen, |
2990 | bitmap[2] = {0}; | 2994 | bitmap[2] = {0}; |
2991 | int status; | 2995 | int status; |
@@ -3010,7 +3014,7 @@ xdr_error: | |||
3010 | 3014 | ||
3011 | static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, const struct nfs_server *server) | 3015 | static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, const struct nfs_server *server) |
3012 | { | 3016 | { |
3013 | uint32_t *savep; | 3017 | __be32 *savep; |
3014 | uint32_t attrlen, | 3018 | uint32_t attrlen, |
3015 | bitmap[2] = {0}, | 3019 | bitmap[2] = {0}, |
3016 | type; | 3020 | type; |
@@ -3079,7 +3083,7 @@ xdr_error: | |||
3079 | 3083 | ||
3080 | static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) | 3084 | static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) |
3081 | { | 3085 | { |
3082 | uint32_t *savep; | 3086 | __be32 *savep; |
3083 | uint32_t attrlen, bitmap[2]; | 3087 | uint32_t attrlen, bitmap[2]; |
3084 | int status; | 3088 | int status; |
3085 | 3089 | ||
@@ -3111,7 +3115,7 @@ xdr_error: | |||
3111 | 3115 | ||
3112 | static int decode_getfh(struct xdr_stream *xdr, struct nfs_fh *fh) | 3116 | static int decode_getfh(struct xdr_stream *xdr, struct nfs_fh *fh) |
3113 | { | 3117 | { |
3114 | uint32_t *p; | 3118 | __be32 *p; |
3115 | uint32_t len; | 3119 | uint32_t len; |
3116 | int status; | 3120 | int status; |
3117 | 3121 | ||
@@ -3147,7 +3151,7 @@ static int decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | |||
3147 | static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) | 3151 | static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) |
3148 | { | 3152 | { |
3149 | uint64_t offset, length, clientid; | 3153 | uint64_t offset, length, clientid; |
3150 | uint32_t *p; | 3154 | __be32 *p; |
3151 | uint32_t namelen, type; | 3155 | uint32_t namelen, type; |
3152 | 3156 | ||
3153 | READ_BUF(32); | 3157 | READ_BUF(32); |
@@ -3172,7 +3176,7 @@ static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) | |||
3172 | 3176 | ||
3173 | static int decode_lock(struct xdr_stream *xdr, struct nfs_lock_res *res) | 3177 | static int decode_lock(struct xdr_stream *xdr, struct nfs_lock_res *res) |
3174 | { | 3178 | { |
3175 | uint32_t *p; | 3179 | __be32 *p; |
3176 | int status; | 3180 | int status; |
3177 | 3181 | ||
3178 | status = decode_op_hdr(xdr, OP_LOCK); | 3182 | status = decode_op_hdr(xdr, OP_LOCK); |
@@ -3195,7 +3199,7 @@ static int decode_lockt(struct xdr_stream *xdr, struct nfs_lockt_res *res) | |||
3195 | 3199 | ||
3196 | static int decode_locku(struct xdr_stream *xdr, struct nfs_locku_res *res) | 3200 | static int decode_locku(struct xdr_stream *xdr, struct nfs_locku_res *res) |
3197 | { | 3201 | { |
3198 | uint32_t *p; | 3202 | __be32 *p; |
3199 | int status; | 3203 | int status; |
3200 | 3204 | ||
3201 | status = decode_op_hdr(xdr, OP_LOCKU); | 3205 | status = decode_op_hdr(xdr, OP_LOCKU); |
@@ -3214,7 +3218,7 @@ static int decode_lookup(struct xdr_stream *xdr) | |||
3214 | /* This is too sick! */ | 3218 | /* This is too sick! */ |
3215 | static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) | 3219 | static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) |
3216 | { | 3220 | { |
3217 | uint32_t *p; | 3221 | __be32 *p; |
3218 | uint32_t limit_type, nblocks, blocksize; | 3222 | uint32_t limit_type, nblocks, blocksize; |
3219 | 3223 | ||
3220 | READ_BUF(12); | 3224 | READ_BUF(12); |
@@ -3233,7 +3237,7 @@ static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) | |||
3233 | 3237 | ||
3234 | static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) | 3238 | static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) |
3235 | { | 3239 | { |
3236 | uint32_t *p; | 3240 | __be32 *p; |
3237 | uint32_t delegation_type; | 3241 | uint32_t delegation_type; |
3238 | 3242 | ||
3239 | READ_BUF(4); | 3243 | READ_BUF(4); |
@@ -3259,7 +3263,7 @@ static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) | |||
3259 | 3263 | ||
3260 | static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) | 3264 | static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) |
3261 | { | 3265 | { |
3262 | uint32_t *p; | 3266 | __be32 *p; |
3263 | uint32_t bmlen; | 3267 | uint32_t bmlen; |
3264 | int status; | 3268 | int status; |
3265 | 3269 | ||
@@ -3287,7 +3291,7 @@ xdr_error: | |||
3287 | 3291 | ||
3288 | static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmres *res) | 3292 | static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmres *res) |
3289 | { | 3293 | { |
3290 | uint32_t *p; | 3294 | __be32 *p; |
3291 | int status; | 3295 | int status; |
3292 | 3296 | ||
3293 | status = decode_op_hdr(xdr, OP_OPEN_CONFIRM); | 3297 | status = decode_op_hdr(xdr, OP_OPEN_CONFIRM); |
@@ -3300,7 +3304,7 @@ static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmre | |||
3300 | 3304 | ||
3301 | static int decode_open_downgrade(struct xdr_stream *xdr, struct nfs_closeres *res) | 3305 | static int decode_open_downgrade(struct xdr_stream *xdr, struct nfs_closeres *res) |
3302 | { | 3306 | { |
3303 | uint32_t *p; | 3307 | __be32 *p; |
3304 | int status; | 3308 | int status; |
3305 | 3309 | ||
3306 | status = decode_op_hdr(xdr, OP_OPEN_DOWNGRADE); | 3310 | status = decode_op_hdr(xdr, OP_OPEN_DOWNGRADE); |
@@ -3324,7 +3328,7 @@ static int decode_putrootfh(struct xdr_stream *xdr) | |||
3324 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs_readres *res) | 3328 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs_readres *res) |
3325 | { | 3329 | { |
3326 | struct kvec *iov = req->rq_rcv_buf.head; | 3330 | struct kvec *iov = req->rq_rcv_buf.head; |
3327 | uint32_t *p; | 3331 | __be32 *p; |
3328 | uint32_t count, eof, recvd, hdrlen; | 3332 | uint32_t count, eof, recvd, hdrlen; |
3329 | int status; | 3333 | int status; |
3330 | 3334 | ||
@@ -3354,7 +3358,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n | |||
3354 | struct page *page = *rcvbuf->pages; | 3358 | struct page *page = *rcvbuf->pages; |
3355 | struct kvec *iov = rcvbuf->head; | 3359 | struct kvec *iov = rcvbuf->head; |
3356 | unsigned int nr, pglen = rcvbuf->page_len; | 3360 | unsigned int nr, pglen = rcvbuf->page_len; |
3357 | uint32_t *end, *entry, *p, *kaddr; | 3361 | __be32 *end, *entry, *p, *kaddr; |
3358 | uint32_t len, attrlen, xlen; | 3362 | uint32_t len, attrlen, xlen; |
3359 | int hdrlen, recvd, status; | 3363 | int hdrlen, recvd, status; |
3360 | 3364 | ||
@@ -3376,7 +3380,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n | |||
3376 | xdr_read_pages(xdr, pglen); | 3380 | xdr_read_pages(xdr, pglen); |
3377 | 3381 | ||
3378 | BUG_ON(pglen + readdir->pgbase > PAGE_CACHE_SIZE); | 3382 | BUG_ON(pglen + readdir->pgbase > PAGE_CACHE_SIZE); |
3379 | kaddr = p = (uint32_t *) kmap_atomic(page, KM_USER0); | 3383 | kaddr = p = kmap_atomic(page, KM_USER0); |
3380 | end = p + ((pglen + readdir->pgbase) >> 2); | 3384 | end = p + ((pglen + readdir->pgbase) >> 2); |
3381 | entry = p; | 3385 | entry = p; |
3382 | for (nr = 0; *p++; nr++) { | 3386 | for (nr = 0; *p++; nr++) { |
@@ -3428,7 +3432,7 @@ static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req) | |||
3428 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 3432 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
3429 | struct kvec *iov = rcvbuf->head; | 3433 | struct kvec *iov = rcvbuf->head; |
3430 | int hdrlen, len, recvd; | 3434 | int hdrlen, len, recvd; |
3431 | uint32_t *p; | 3435 | __be32 *p; |
3432 | char *kaddr; | 3436 | char *kaddr; |
3433 | int status; | 3437 | int status; |
3434 | 3438 | ||
@@ -3505,7 +3509,7 @@ decode_restorefh(struct xdr_stream *xdr) | |||
3505 | static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, | 3509 | static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, |
3506 | size_t *acl_len) | 3510 | size_t *acl_len) |
3507 | { | 3511 | { |
3508 | uint32_t *savep; | 3512 | __be32 *savep; |
3509 | uint32_t attrlen, | 3513 | uint32_t attrlen, |
3510 | bitmap[2] = {0}; | 3514 | bitmap[2] = {0}; |
3511 | struct kvec *iov = req->rq_rcv_buf.head; | 3515 | struct kvec *iov = req->rq_rcv_buf.head; |
@@ -3551,7 +3555,7 @@ decode_savefh(struct xdr_stream *xdr) | |||
3551 | 3555 | ||
3552 | static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) | 3556 | static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) |
3553 | { | 3557 | { |
3554 | uint32_t *p; | 3558 | __be32 *p; |
3555 | uint32_t bmlen; | 3559 | uint32_t bmlen; |
3556 | int status; | 3560 | int status; |
3557 | 3561 | ||
@@ -3567,7 +3571,7 @@ static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) | |||
3567 | 3571 | ||
3568 | static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp) | 3572 | static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp) |
3569 | { | 3573 | { |
3570 | uint32_t *p; | 3574 | __be32 *p; |
3571 | uint32_t opnum; | 3575 | uint32_t opnum; |
3572 | int32_t nfserr; | 3576 | int32_t nfserr; |
3573 | 3577 | ||
@@ -3610,7 +3614,7 @@ static int decode_setclientid_confirm(struct xdr_stream *xdr) | |||
3610 | 3614 | ||
3611 | static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res) | 3615 | static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res) |
3612 | { | 3616 | { |
3613 | uint32_t *p; | 3617 | __be32 *p; |
3614 | int status; | 3618 | int status; |
3615 | 3619 | ||
3616 | status = decode_op_hdr(xdr, OP_WRITE); | 3620 | status = decode_op_hdr(xdr, OP_WRITE); |
@@ -3632,7 +3636,7 @@ static int decode_delegreturn(struct xdr_stream *xdr) | |||
3632 | /* | 3636 | /* |
3633 | * Decode OPEN_DOWNGRADE response | 3637 | * Decode OPEN_DOWNGRADE response |
3634 | */ | 3638 | */ |
3635 | static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res) | 3639 | static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) |
3636 | { | 3640 | { |
3637 | struct xdr_stream xdr; | 3641 | struct xdr_stream xdr; |
3638 | struct compound_hdr hdr; | 3642 | struct compound_hdr hdr; |
@@ -3660,7 +3664,7 @@ out: | |||
3660 | /* | 3664 | /* |
3661 | * Decode ACCESS response | 3665 | * Decode ACCESS response |
3662 | */ | 3666 | */ |
3663 | static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_accessres *res) | 3667 | static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_accessres *res) |
3664 | { | 3668 | { |
3665 | struct xdr_stream xdr; | 3669 | struct xdr_stream xdr; |
3666 | struct compound_hdr hdr; | 3670 | struct compound_hdr hdr; |
@@ -3678,7 +3682,7 @@ out: | |||
3678 | /* | 3682 | /* |
3679 | * Decode LOOKUP response | 3683 | * Decode LOOKUP response |
3680 | */ | 3684 | */ |
3681 | static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_lookup_res *res) | 3685 | static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) |
3682 | { | 3686 | { |
3683 | struct xdr_stream xdr; | 3687 | struct xdr_stream xdr; |
3684 | struct compound_hdr hdr; | 3688 | struct compound_hdr hdr; |
@@ -3701,7 +3705,7 @@ out: | |||
3701 | /* | 3705 | /* |
3702 | * Decode LOOKUP_ROOT response | 3706 | * Decode LOOKUP_ROOT response |
3703 | */ | 3707 | */ |
3704 | static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_lookup_res *res) | 3708 | static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) |
3705 | { | 3709 | { |
3706 | struct xdr_stream xdr; | 3710 | struct xdr_stream xdr; |
3707 | struct compound_hdr hdr; | 3711 | struct compound_hdr hdr; |
@@ -3721,7 +3725,7 @@ out: | |||
3721 | /* | 3725 | /* |
3722 | * Decode REMOVE response | 3726 | * Decode REMOVE response |
3723 | */ | 3727 | */ |
3724 | static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_remove_res *res) | 3728 | static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_remove_res *res) |
3725 | { | 3729 | { |
3726 | struct xdr_stream xdr; | 3730 | struct xdr_stream xdr; |
3727 | struct compound_hdr hdr; | 3731 | struct compound_hdr hdr; |
@@ -3742,7 +3746,7 @@ out: | |||
3742 | /* | 3746 | /* |
3743 | * Decode RENAME response | 3747 | * Decode RENAME response |
3744 | */ | 3748 | */ |
3745 | static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_rename_res *res) | 3749 | static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_rename_res *res) |
3746 | { | 3750 | { |
3747 | struct xdr_stream xdr; | 3751 | struct xdr_stream xdr; |
3748 | struct compound_hdr hdr; | 3752 | struct compound_hdr hdr; |
@@ -3772,7 +3776,7 @@ out: | |||
3772 | /* | 3776 | /* |
3773 | * Decode LINK response | 3777 | * Decode LINK response |
3774 | */ | 3778 | */ |
3775 | static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_link_res *res) | 3779 | static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link_res *res) |
3776 | { | 3780 | { |
3777 | struct xdr_stream xdr; | 3781 | struct xdr_stream xdr; |
3778 | struct compound_hdr hdr; | 3782 | struct compound_hdr hdr; |
@@ -3805,7 +3809,7 @@ out: | |||
3805 | /* | 3809 | /* |
3806 | * Decode CREATE response | 3810 | * Decode CREATE response |
3807 | */ | 3811 | */ |
3808 | static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_create_res *res) | 3812 | static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) |
3809 | { | 3813 | { |
3810 | struct xdr_stream xdr; | 3814 | struct xdr_stream xdr; |
3811 | struct compound_hdr hdr; | 3815 | struct compound_hdr hdr; |
@@ -3834,7 +3838,7 @@ out: | |||
3834 | /* | 3838 | /* |
3835 | * Decode SYMLINK response | 3839 | * Decode SYMLINK response |
3836 | */ | 3840 | */ |
3837 | static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_create_res *res) | 3841 | static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) |
3838 | { | 3842 | { |
3839 | return nfs4_xdr_dec_create(rqstp, p, res); | 3843 | return nfs4_xdr_dec_create(rqstp, p, res); |
3840 | } | 3844 | } |
@@ -3842,7 +3846,7 @@ static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4 | |||
3842 | /* | 3846 | /* |
3843 | * Decode GETATTR response | 3847 | * Decode GETATTR response |
3844 | */ | 3848 | */ |
3845 | static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_getattr_res *res) | 3849 | static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_getattr_res *res) |
3846 | { | 3850 | { |
3847 | struct xdr_stream xdr; | 3851 | struct xdr_stream xdr; |
3848 | struct compound_hdr hdr; | 3852 | struct compound_hdr hdr; |
@@ -3865,7 +3869,7 @@ out: | |||
3865 | * Encode an SETACL request | 3869 | * Encode an SETACL request |
3866 | */ | 3870 | */ |
3867 | static int | 3871 | static int |
3868 | nfs4_xdr_enc_setacl(struct rpc_rqst *req, uint32_t *p, struct nfs_setaclargs *args) | 3872 | nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args) |
3869 | { | 3873 | { |
3870 | struct xdr_stream xdr; | 3874 | struct xdr_stream xdr; |
3871 | struct compound_hdr hdr = { | 3875 | struct compound_hdr hdr = { |
@@ -3886,7 +3890,7 @@ out: | |||
3886 | * Decode SETACL response | 3890 | * Decode SETACL response |
3887 | */ | 3891 | */ |
3888 | static int | 3892 | static int |
3889 | nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, uint32_t *p, void *res) | 3893 | nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res) |
3890 | { | 3894 | { |
3891 | struct xdr_stream xdr; | 3895 | struct xdr_stream xdr; |
3892 | struct compound_hdr hdr; | 3896 | struct compound_hdr hdr; |
@@ -3908,7 +3912,7 @@ out: | |||
3908 | * Decode GETACL response | 3912 | * Decode GETACL response |
3909 | */ | 3913 | */ |
3910 | static int | 3914 | static int |
3911 | nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, uint32_t *p, size_t *acl_len) | 3915 | nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p, size_t *acl_len) |
3912 | { | 3916 | { |
3913 | struct xdr_stream xdr; | 3917 | struct xdr_stream xdr; |
3914 | struct compound_hdr hdr; | 3918 | struct compound_hdr hdr; |
@@ -3930,7 +3934,7 @@ out: | |||
3930 | /* | 3934 | /* |
3931 | * Decode CLOSE response | 3935 | * Decode CLOSE response |
3932 | */ | 3936 | */ |
3933 | static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res) | 3937 | static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) |
3934 | { | 3938 | { |
3935 | struct xdr_stream xdr; | 3939 | struct xdr_stream xdr; |
3936 | struct compound_hdr hdr; | 3940 | struct compound_hdr hdr; |
@@ -3960,7 +3964,7 @@ out: | |||
3960 | /* | 3964 | /* |
3961 | * Decode OPEN response | 3965 | * Decode OPEN response |
3962 | */ | 3966 | */ |
3963 | static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_openres *res) | 3967 | static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) |
3964 | { | 3968 | { |
3965 | struct xdr_stream xdr; | 3969 | struct xdr_stream xdr; |
3966 | struct compound_hdr hdr; | 3970 | struct compound_hdr hdr; |
@@ -3994,7 +3998,7 @@ out: | |||
3994 | /* | 3998 | /* |
3995 | * Decode OPEN_CONFIRM response | 3999 | * Decode OPEN_CONFIRM response |
3996 | */ | 4000 | */ |
3997 | static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_open_confirmres *res) | 4001 | static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, __be32 *p, struct nfs_open_confirmres *res) |
3998 | { | 4002 | { |
3999 | struct xdr_stream xdr; | 4003 | struct xdr_stream xdr; |
4000 | struct compound_hdr hdr; | 4004 | struct compound_hdr hdr; |
@@ -4015,7 +4019,7 @@ out: | |||
4015 | /* | 4019 | /* |
4016 | * Decode OPEN response | 4020 | * Decode OPEN response |
4017 | */ | 4021 | */ |
4018 | static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_openres *res) | 4022 | static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) |
4019 | { | 4023 | { |
4020 | struct xdr_stream xdr; | 4024 | struct xdr_stream xdr; |
4021 | struct compound_hdr hdr; | 4025 | struct compound_hdr hdr; |
@@ -4039,7 +4043,7 @@ out: | |||
4039 | /* | 4043 | /* |
4040 | * Decode SETATTR response | 4044 | * Decode SETATTR response |
4041 | */ | 4045 | */ |
4042 | static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_setattrres *res) | 4046 | static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_setattrres *res) |
4043 | { | 4047 | { |
4044 | struct xdr_stream xdr; | 4048 | struct xdr_stream xdr; |
4045 | struct compound_hdr hdr; | 4049 | struct compound_hdr hdr; |
@@ -4065,7 +4069,7 @@ out: | |||
4065 | /* | 4069 | /* |
4066 | * Decode LOCK response | 4070 | * Decode LOCK response |
4067 | */ | 4071 | */ |
4068 | static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lock_res *res) | 4072 | static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_res *res) |
4069 | { | 4073 | { |
4070 | struct xdr_stream xdr; | 4074 | struct xdr_stream xdr; |
4071 | struct compound_hdr hdr; | 4075 | struct compound_hdr hdr; |
@@ -4086,7 +4090,7 @@ out: | |||
4086 | /* | 4090 | /* |
4087 | * Decode LOCKT response | 4091 | * Decode LOCKT response |
4088 | */ | 4092 | */ |
4089 | static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockt_res *res) | 4093 | static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lockt_res *res) |
4090 | { | 4094 | { |
4091 | struct xdr_stream xdr; | 4095 | struct xdr_stream xdr; |
4092 | struct compound_hdr hdr; | 4096 | struct compound_hdr hdr; |
@@ -4107,7 +4111,7 @@ out: | |||
4107 | /* | 4111 | /* |
4108 | * Decode LOCKU response | 4112 | * Decode LOCKU response |
4109 | */ | 4113 | */ |
4110 | static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_locku_res *res) | 4114 | static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, __be32 *p, struct nfs_locku_res *res) |
4111 | { | 4115 | { |
4112 | struct xdr_stream xdr; | 4116 | struct xdr_stream xdr; |
4113 | struct compound_hdr hdr; | 4117 | struct compound_hdr hdr; |
@@ -4128,7 +4132,7 @@ out: | |||
4128 | /* | 4132 | /* |
4129 | * Decode READLINK response | 4133 | * Decode READLINK response |
4130 | */ | 4134 | */ |
4131 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, uint32_t *p, void *res) | 4135 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, void *res) |
4132 | { | 4136 | { |
4133 | struct xdr_stream xdr; | 4137 | struct xdr_stream xdr; |
4134 | struct compound_hdr hdr; | 4138 | struct compound_hdr hdr; |
@@ -4149,7 +4153,7 @@ out: | |||
4149 | /* | 4153 | /* |
4150 | * Decode READDIR response | 4154 | * Decode READDIR response |
4151 | */ | 4155 | */ |
4152 | static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_readdir_res *res) | 4156 | static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_readdir_res *res) |
4153 | { | 4157 | { |
4154 | struct xdr_stream xdr; | 4158 | struct xdr_stream xdr; |
4155 | struct compound_hdr hdr; | 4159 | struct compound_hdr hdr; |
@@ -4170,7 +4174,7 @@ out: | |||
4170 | /* | 4174 | /* |
4171 | * Decode Read response | 4175 | * Decode Read response |
4172 | */ | 4176 | */ |
4173 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_readres *res) | 4177 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readres *res) |
4174 | { | 4178 | { |
4175 | struct xdr_stream xdr; | 4179 | struct xdr_stream xdr; |
4176 | struct compound_hdr hdr; | 4180 | struct compound_hdr hdr; |
@@ -4193,7 +4197,7 @@ out: | |||
4193 | /* | 4197 | /* |
4194 | * Decode WRITE response | 4198 | * Decode WRITE response |
4195 | */ | 4199 | */ |
4196 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_writeres *res) | 4200 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) |
4197 | { | 4201 | { |
4198 | struct xdr_stream xdr; | 4202 | struct xdr_stream xdr; |
4199 | struct compound_hdr hdr; | 4203 | struct compound_hdr hdr; |
@@ -4219,7 +4223,7 @@ out: | |||
4219 | /* | 4223 | /* |
4220 | * Decode COMMIT response | 4224 | * Decode COMMIT response |
4221 | */ | 4225 | */ |
4222 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_writeres *res) | 4226 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) |
4223 | { | 4227 | { |
4224 | struct xdr_stream xdr; | 4228 | struct xdr_stream xdr; |
4225 | struct compound_hdr hdr; | 4229 | struct compound_hdr hdr; |
@@ -4243,7 +4247,7 @@ out: | |||
4243 | /* | 4247 | /* |
4244 | * FSINFO request | 4248 | * FSINFO request |
4245 | */ | 4249 | */ |
4246 | static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs_fsinfo *fsinfo) | 4250 | static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo) |
4247 | { | 4251 | { |
4248 | struct xdr_stream xdr; | 4252 | struct xdr_stream xdr; |
4249 | struct compound_hdr hdr; | 4253 | struct compound_hdr hdr; |
@@ -4263,7 +4267,7 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs_fsi | |||
4263 | /* | 4267 | /* |
4264 | * PATHCONF request | 4268 | * PATHCONF request |
4265 | */ | 4269 | */ |
4266 | static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_pathconf *pathconf) | 4270 | static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p, struct nfs_pathconf *pathconf) |
4267 | { | 4271 | { |
4268 | struct xdr_stream xdr; | 4272 | struct xdr_stream xdr; |
4269 | struct compound_hdr hdr; | 4273 | struct compound_hdr hdr; |
@@ -4281,7 +4285,7 @@ static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_p | |||
4281 | /* | 4285 | /* |
4282 | * STATFS request | 4286 | * STATFS request |
4283 | */ | 4287 | */ |
4284 | static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fsstat *fsstat) | 4288 | static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, __be32 *p, struct nfs_fsstat *fsstat) |
4285 | { | 4289 | { |
4286 | struct xdr_stream xdr; | 4290 | struct xdr_stream xdr; |
4287 | struct compound_hdr hdr; | 4291 | struct compound_hdr hdr; |
@@ -4299,7 +4303,7 @@ static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fss | |||
4299 | /* | 4303 | /* |
4300 | * GETATTR_BITMAP request | 4304 | * GETATTR_BITMAP request |
4301 | */ | 4305 | */ |
4302 | static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, uint32_t *p, struct nfs4_server_caps_res *res) | 4306 | static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4_server_caps_res *res) |
4303 | { | 4307 | { |
4304 | struct xdr_stream xdr; | 4308 | struct xdr_stream xdr; |
4305 | struct compound_hdr hdr; | 4309 | struct compound_hdr hdr; |
@@ -4318,7 +4322,7 @@ out: | |||
4318 | /* | 4322 | /* |
4319 | * Decode RENEW response | 4323 | * Decode RENEW response |
4320 | */ | 4324 | */ |
4321 | static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy) | 4325 | static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, __be32 *p, void *dummy) |
4322 | { | 4326 | { |
4323 | struct xdr_stream xdr; | 4327 | struct xdr_stream xdr; |
4324 | struct compound_hdr hdr; | 4328 | struct compound_hdr hdr; |
@@ -4334,7 +4338,7 @@ static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy) | |||
4334 | /* | 4338 | /* |
4335 | * a SETCLIENTID request | 4339 | * a SETCLIENTID request |
4336 | */ | 4340 | */ |
4337 | static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, | 4341 | static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, __be32 *p, |
4338 | struct nfs_client *clp) | 4342 | struct nfs_client *clp) |
4339 | { | 4343 | { |
4340 | struct xdr_stream xdr; | 4344 | struct xdr_stream xdr; |
@@ -4353,7 +4357,7 @@ static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, | |||
4353 | /* | 4357 | /* |
4354 | * a SETCLIENTID_CONFIRM request | 4358 | * a SETCLIENTID_CONFIRM request |
4355 | */ | 4359 | */ |
4356 | static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_fsinfo *fsinfo) | 4360 | static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo) |
4357 | { | 4361 | { |
4358 | struct xdr_stream xdr; | 4362 | struct xdr_stream xdr; |
4359 | struct compound_hdr hdr; | 4363 | struct compound_hdr hdr; |
@@ -4375,7 +4379,7 @@ static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, s | |||
4375 | /* | 4379 | /* |
4376 | * DELEGRETURN request | 4380 | * DELEGRETURN request |
4377 | */ | 4381 | */ |
4378 | static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_delegreturnres *res) | 4382 | static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_delegreturnres *res) |
4379 | { | 4383 | { |
4380 | struct xdr_stream xdr; | 4384 | struct xdr_stream xdr; |
4381 | struct compound_hdr hdr; | 4385 | struct compound_hdr hdr; |
@@ -4397,7 +4401,7 @@ out: | |||
4397 | /* | 4401 | /* |
4398 | * FS_LOCATIONS request | 4402 | * FS_LOCATIONS request |
4399 | */ | 4403 | */ |
4400 | static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations *res) | 4404 | static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs4_fs_locations *res) |
4401 | { | 4405 | { |
4402 | struct xdr_stream xdr; | 4406 | struct xdr_stream xdr; |
4403 | struct compound_hdr hdr; | 4407 | struct compound_hdr hdr; |