diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:40 -0400 |
commit | bc4785cd475a11ba125df7af674e16c6ea1cfc30 (patch) | |
tree | 4f552e0736d1e81460768f689fb6c4b500684066 /fs | |
parent | 5704fdeb41c9fb282ae576516f221ea0b8f64b2b (diff) |
[PATCH] nfs: verifier is network-endian
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')
-rw-r--r-- | fs/nfs/nfs3proc.c | 2 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 3b234d4601e7..e5f128ffc32d 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -668,7 +668,7 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, | |||
668 | { | 668 | { |
669 | struct inode *dir = dentry->d_inode; | 669 | struct inode *dir = dentry->d_inode; |
670 | struct nfs_fattr dir_attr; | 670 | struct nfs_fattr dir_attr; |
671 | u32 *verf = NFS_COOKIEVERF(dir); | 671 | __be32 *verf = NFS_COOKIEVERF(dir); |
672 | struct nfs3_readdirargs arg = { | 672 | struct nfs3_readdirargs arg = { |
673 | .fh = NFS_FH(dir), | 673 | .fh = NFS_FH(dir), |
674 | .cookie = cookie, | 674 | .cookie = cookie, |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 8d09b47c91b9..8118036cc449 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -138,7 +138,7 @@ const u32 nfs4_fs_locations_bitmap[2] = { | |||
138 | | FATTR4_WORD1_MOUNTED_ON_FILEID | 138 | | FATTR4_WORD1_MOUNTED_ON_FILEID |
139 | }; | 139 | }; |
140 | 140 | ||
141 | static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, | 141 | static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dentry, |
142 | struct nfs4_readdir_arg *readdir) | 142 | struct nfs4_readdir_arg *readdir) |
143 | { | 143 | { |
144 | __be32 *start, *p; | 144 | __be32 *start, *p; |
@@ -2915,11 +2915,11 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short po | |||
2915 | .rpc_resp = clp, | 2915 | .rpc_resp = clp, |
2916 | .rpc_cred = cred, | 2916 | .rpc_cred = cred, |
2917 | }; | 2917 | }; |
2918 | u32 *p; | 2918 | __be32 *p; |
2919 | int loop = 0; | 2919 | int loop = 0; |
2920 | int status; | 2920 | int status; |
2921 | 2921 | ||
2922 | p = (u32*)sc_verifier.data; | 2922 | p = (__be32*)sc_verifier.data; |
2923 | *p++ = htonl((u32)clp->cl_boot_time.tv_sec); | 2923 | *p++ = htonl((u32)clp->cl_boot_time.tv_sec); |
2924 | *p = htonl((u32)clp->cl_boot_time.tv_nsec); | 2924 | *p = htonl((u32)clp->cl_boot_time.tv_nsec); |
2925 | 2925 | ||