aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4xdr.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-06-22 13:16:21 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-06-22 16:07:06 -0400
commit4ce79717ce32a9f88c1ddce4b9658556cb59d37a (patch)
tree7f0c5e4bdbc2ee15b8e902b951d1be200b35411f /fs/nfs/nfs4xdr.c
parent9085bbcb76421a90bea28f4d3d03fa9977319c49 (diff)
[PATCH] NFS: Header file cleanup...
- Move NFSv4 state definitions into a private header file. - Clean up gunk in nfs_fs.h Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r--fs/nfs/nfs4xdr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 5f4de05763c9..e86406eff0eb 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -51,6 +51,7 @@
51#include <linux/nfs4.h> 51#include <linux/nfs4.h>
52#include <linux/nfs_fs.h> 52#include <linux/nfs_fs.h>
53#include <linux/nfs_idmap.h> 53#include <linux/nfs_idmap.h>
54#include "nfs4_fs.h"
54 55
55#define NFSDBG_FACILITY NFSDBG_XDR 56#define NFSDBG_FACILITY NFSDBG_XDR
56 57
@@ -660,8 +661,6 @@ static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1
660 661
661static int encode_getfattr(struct xdr_stream *xdr, const u32* bitmask) 662static int encode_getfattr(struct xdr_stream *xdr, const u32* bitmask)
662{ 663{
663 extern u32 nfs4_fattr_bitmap[];
664
665 return encode_getattr_two(xdr, 664 return encode_getattr_two(xdr,
666 bitmask[0] & nfs4_fattr_bitmap[0], 665 bitmask[0] & nfs4_fattr_bitmap[0],
667 bitmask[1] & nfs4_fattr_bitmap[1]); 666 bitmask[1] & nfs4_fattr_bitmap[1]);
@@ -669,8 +668,6 @@ static int encode_getfattr(struct xdr_stream *xdr, const u32* bitmask)
669 668
670static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask) 669static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask)
671{ 670{
672 extern u32 nfs4_fsinfo_bitmap[];
673
674 return encode_getattr_two(xdr, bitmask[0] & nfs4_fsinfo_bitmap[0], 671 return encode_getattr_two(xdr, bitmask[0] & nfs4_fsinfo_bitmap[0],
675 bitmask[1] & nfs4_fsinfo_bitmap[1]); 672 bitmask[1] & nfs4_fsinfo_bitmap[1]);
676} 673}
@@ -969,7 +966,6 @@ static int encode_putrootfh(struct xdr_stream *xdr)
969 966
970static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx) 967static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx)
971{ 968{
972 extern nfs4_stateid zero_stateid;
973 nfs4_stateid stateid; 969 nfs4_stateid stateid;
974 uint32_t *p; 970 uint32_t *p;
975 971
@@ -1697,7 +1693,6 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs
1697 */ 1693 */
1698static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct nfs4_pathconf_arg *args) 1694static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct nfs4_pathconf_arg *args)
1699{ 1695{
1700 extern u32 nfs4_pathconf_bitmap[2];
1701 struct xdr_stream xdr; 1696 struct xdr_stream xdr;
1702 struct compound_hdr hdr = { 1697 struct compound_hdr hdr = {
1703 .nops = 2, 1698 .nops = 2,
@@ -1718,7 +1713,6 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct
1718 */ 1713 */
1719static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct nfs4_statfs_arg *args) 1714static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct nfs4_statfs_arg *args)
1720{ 1715{
1721 extern u32 nfs4_statfs_bitmap[];
1722 struct xdr_stream xdr; 1716 struct xdr_stream xdr;
1723 struct compound_hdr hdr = { 1717 struct compound_hdr hdr = {
1724 .nops = 2, 1718 .nops = 2,