From: Trond Myklebust <trond.myklebust@fys.uio.no>
NFSv2/v3/v4: Parenthesize #defines in nfs?xdr.c. Fix an off-by-one error
on the value of compound_decode_hdr_maxsz
NFSv4: fix a printk() typo (spotted by Linda Dunaphant).
NFSv4: Ensure that nfs4_open_reclaim() copies the value of the new stateid
back into the shared nfsv4 state structure.
NFSv4: Don't leak NFS4ERR_WRONGSEC errors back into nfs_lookup().
RPC,NFS,Lockd: Mark the debugging code as "unlikely" so that gcc moves it
out of the mainline code paths.
---
fs/nfs/inode.c | 2
fs/nfs/nfs2xdr.c | 54 +++++------
fs/nfs/nfs3xdr.c | 82 ++++++++--------
fs/nfs/nfs4proc.c | 10 +-
fs/nfs/nfs4state.c | 2
fs/nfs/nfs4xdr.c | 210 +++++++++++++++++++++----------------------
include/linux/lockd/debug.h | 2
include/linux/nfs_fs.h | 2
include/linux/sunrpc/debug.h | 2
9 files changed, 187 insertions(+), 179 deletions(-)
diff -puN fs/nfs/inode.c~nfs-misc-minor-fixes fs/nfs/inode.c
--- 25/fs/nfs/inode.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/inode.c 2004-02-29 14:52:05.000000000 -0800
@@ -1622,7 +1622,7 @@ static struct super_block *nfs4_get_sb(s
if (data->version != NFS4_MOUNT_VERSION) {
printk("nfs warning: mount version %s than kernel\n",
- data->version < NFS_MOUNT_VERSION ? "older" : "newer");
+ data->version < NFS4_MOUNT_VERSION ? "older" : "newer");
}
p = nfs_copy_user_string(NULL, &data->hostname, 256);
diff -puN fs/nfs/nfs2xdr.c~nfs-misc-minor-fixes fs/nfs/nfs2xdr.c
--- 25/fs/nfs/nfs2xdr.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/nfs2xdr.c 2004-02-29 14:52:05.000000000 -0800
@@ -36,33 +36,33 @@ extern int nfs_stat_to_errno(int stat)
* Declare the space requirements for NFS arguments and replies as
* number of 32bit-words
*/
-#define NFS_fhandle_sz 8
-#define NFS_sattr_sz 8
-#define NFS_filename_sz 1+(NFS2_MAXNAMLEN>>2)
-#define NFS_path_sz 1+(NFS2_MAXPATHLEN>>2)
-#define NFS_fattr_sz 17
-#define NFS_info_sz 5
-#define NFS_entry_sz NFS_filename_sz+3
-
-#define NFS_diropargs_sz NFS_fhandle_sz+NFS_filename_sz
-#define NFS_sattrargs_sz NFS_fhandle_sz+NFS_sattr_sz
-#define NFS_readlinkargs_sz NFS_fhandle_sz
-#define NFS_readargs_sz NFS_fhandle_sz+3
-#define NFS_writeargs_sz NFS_fhandle_sz+4
-#define NFS_createargs_sz NFS_diropargs_sz+NFS_sattr_sz
-#define NFS_renameargs_sz NFS_diropargs_sz+NFS_diropargs_sz
-#define NFS_linkargs_sz NFS_fhandle_sz+NFS_diropargs_sz
-#define NFS_symlinkargs_sz NFS_diropargs_sz+NFS_path_sz+NFS_sattr_sz
-#define NFS_readdirargs_sz NFS_fhandle_sz+2
-
-#define NFS_attrstat_sz 1+NFS_fattr_sz
-#define NFS_diropres_sz 1+NFS_fhandle_sz+NFS_fattr_sz
-#define NFS_readlinkres_sz 1
-#define NFS_readres_sz 1+NFS_fattr_sz+1
-#define NFS_writeres_sz NFS_attrstat_sz
-#define NFS_stat_sz 1
-#define NFS_readdirres_sz 1
-#define NFS_statfsres_sz 1+NFS_info_sz
+#define NFS_fhandle_sz (8)
+#define NFS_sattr_sz (8)
+#define NFS_filename_sz (1+(NFS2_MAXNAMLEN>>2))
+#define NFS_path_sz (1+(NFS2_MAXPATHLEN>>2))
+#define NFS_fattr_sz (17)
+#define NFS_info_sz (5)
+#define NFS_entry_sz (NFS_filename_sz+3)
+
+#define NFS_diropargs_sz (NFS_fhandle_sz+NFS_filename_sz)
+#define NFS_sattrargs_sz (NFS_fhandle_sz+NFS_sattr_sz)
+#define NFS_readlinkargs_sz (NFS_fhandle_sz)
+#define NFS_readargs_sz (NFS_fhandle_sz+3)
+#define NFS_writeargs_sz (NFS_fhandle_sz+4)
+#define NFS_createargs_sz (NFS_diropargs_sz+NFS_sattr_sz)
+#define NFS_renameargs_sz (NFS_diropargs_sz+NFS_diropargs_sz)
+#define NFS_linkargs_sz (NFS_fhandle_sz+NFS_diropargs_sz)
+#define NFS_symlinkargs_sz (NFS_diropargs_sz+NFS_path_sz+NFS_sattr_sz)
+#define NFS_readdirargs_sz (NFS_fhandle_sz+2)
+
+#define NFS_attrstat_sz (1+NFS_fattr_sz)
+#define NFS_diropres_sz (1+NFS_fhandle_sz+NFS_fattr_sz)
+#define NFS_readlinkres_sz (1)
+#define NFS_readres_sz (1+NFS_fattr_sz+1)
+#define NFS_writeres_sz (NFS_attrstat_sz)
+#define NFS_stat_sz (1)
+#define NFS_readdirres_sz (1)
+#define NFS_statfsres_sz (1+NFS_info_sz)
/*
* Common NFS XDR functions as inlines
diff -puN fs/nfs/nfs3xdr.c~nfs-misc-minor-fixes fs/nfs/nfs3xdr.c
--- 25/fs/nfs/nfs3xdr.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/nfs3xdr.c 2004-02-29 14:52:05.000000000 -0800
@@ -33,51 +33,51 @@ extern int nfs_stat_to_errno(int);
* Declare the space requirements for NFS arguments and replies as
* number of 32bit-words
*/
-#define NFS3_fhandle_sz 1+16
-#define NFS3_fh_sz NFS3_fhandle_sz /* shorthand */
-#define NFS3_sattr_sz 15
-#define NFS3_filename_sz 1+(NFS3_MAXNAMLEN>>2)
-#define NFS3_path_sz 1+(NFS3_MAXPATHLEN>>2)
-#define NFS3_fattr_sz 21
-#define NFS3_wcc_attr_sz 6
-#define NFS3_pre_op_attr_sz 1+NFS3_wcc_attr_sz
-#define NFS3_post_op_attr_sz 1+NFS3_fattr_sz
-#define NFS3_wcc_data_sz NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz
+#define NFS3_fhandle_sz (1+16)
+#define NFS3_fh_sz (NFS3_fhandle_sz) /* shorthand */
+#define NFS3_sattr_sz (15)
+#define NFS3_filename_sz (1+(NFS3_MAXNAMLEN>>2))
+#define NFS3_path_sz (1+(NFS3_MAXPATHLEN>>2))
+#define NFS3_fattr_sz (21)
+#define NFS3_wcc_attr_sz (6)
+#define NFS3_pre_op_attr_sz (1+NFS3_wcc_attr_sz)
+#define NFS3_post_op_attr_sz (1+NFS3_fattr_sz)
+#define NFS3_wcc_data_sz (NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz)
#define NFS3_fsstat_sz
#define NFS3_fsinfo_sz
#define NFS3_pathconf_sz
-#define NFS3_entry_sz NFS3_filename_sz+3
+#define NFS3_entry_sz (NFS3_filename_sz+3)
-#define NFS3_sattrargs_sz NFS3_fh_sz+NFS3_sattr_sz+3
-#define NFS3_diropargs_sz NFS3_fh_sz+NFS3_filename_sz
-#define NFS3_accessargs_sz NFS3_fh_sz+1
-#define NFS3_readlinkargs_sz NFS3_fh_sz
-#define NFS3_readargs_sz NFS3_fh_sz+3
-#define NFS3_writeargs_sz NFS3_fh_sz+5
-#define NFS3_createargs_sz NFS3_diropargs_sz+NFS3_sattr_sz
-#define NFS3_mkdirargs_sz NFS3_diropargs_sz+NFS3_sattr_sz
-#define NFS3_symlinkargs_sz NFS3_diropargs_sz+NFS3_path_sz+NFS3_sattr_sz
-#define NFS3_mknodargs_sz NFS3_diropargs_sz+2+NFS3_sattr_sz
-#define NFS3_renameargs_sz NFS3_diropargs_sz+NFS3_diropargs_sz
-#define NFS3_linkargs_sz NFS3_fh_sz+NFS3_diropargs_sz
-#define NFS3_readdirargs_sz NFS3_fh_sz+2
-#define NFS3_commitargs_sz NFS3_fh_sz+3
-
-#define NFS3_attrstat_sz 1+NFS3_fattr_sz
-#define NFS3_wccstat_sz 1+NFS3_wcc_data_sz
-#define NFS3_lookupres_sz 1+NFS3_fh_sz+(2 * NFS3_post_op_attr_sz)
-#define NFS3_accessres_sz 1+NFS3_post_op_attr_sz+1
-#define NFS3_readlinkres_sz 1+NFS3_post_op_attr_sz
-#define NFS3_readres_sz 1+NFS3_post_op_attr_sz+3
-#define NFS3_writeres_sz 1+NFS3_wcc_data_sz+4
-#define NFS3_createres_sz 1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz
-#define NFS3_renameres_sz 1+(2 * NFS3_wcc_data_sz)
-#define NFS3_linkres_sz 1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz
-#define NFS3_readdirres_sz 1+NFS3_post_op_attr_sz+2
-#define NFS3_fsstatres_sz 1+NFS3_post_op_attr_sz+13
-#define NFS3_fsinfores_sz 1+NFS3_post_op_attr_sz+12
-#define NFS3_pathconfres_sz 1+NFS3_post_op_attr_sz+6
-#define NFS3_commitres_sz 1+NFS3_wcc_data_sz+2
+#define NFS3_sattrargs_sz (NFS3_fh_sz+NFS3_sattr_sz+3)
+#define NFS3_diropargs_sz (NFS3_fh_sz+NFS3_filename_sz)
+#define NFS3_accessargs_sz (NFS3_fh_sz+1)
+#define NFS3_readlinkargs_sz (NFS3_fh_sz)
+#define NFS3_readargs_sz (NFS3_fh_sz+3)
+#define NFS3_writeargs_sz (NFS3_fh_sz+5)
+#define NFS3_createargs_sz (NFS3_diropargs_sz+NFS3_sattr_sz)
+#define NFS3_mkdirargs_sz (NFS3_diropargs_sz+NFS3_sattr_sz)
+#define NFS3_symlinkargs_sz (NFS3_diropargs_sz+NFS3_path_sz+NFS3_sattr_sz)
+#define NFS3_mknodargs_sz (NFS3_diropargs_sz+2+NFS3_sattr_sz)
+#define NFS3_renameargs_sz (NFS3_diropargs_sz+NFS3_diropargs_sz)
+#define NFS3_linkargs_sz (NFS3_fh_sz+NFS3_diropargs_sz)
+#define NFS3_readdirargs_sz (NFS3_fh_sz+2)
+#define NFS3_commitargs_sz (NFS3_fh_sz+3)
+
+#define NFS3_attrstat_sz (1+NFS3_fattr_sz)
+#define NFS3_wccstat_sz (1+NFS3_wcc_data_sz)
+#define NFS3_lookupres_sz (1+NFS3_fh_sz+(2 * NFS3_post_op_attr_sz))
+#define NFS3_accessres_sz (1+NFS3_post_op_attr_sz+1)
+#define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz)
+#define NFS3_readres_sz (1+NFS3_post_op_attr_sz+3)
+#define NFS3_writeres_sz (1+NFS3_wcc_data_sz+4)
+#define NFS3_createres_sz (1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)
+#define NFS3_renameres_sz (1+(2 * NFS3_wcc_data_sz))
+#define NFS3_linkres_sz (1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)
+#define NFS3_readdirres_sz (1+NFS3_post_op_attr_sz+2)
+#define NFS3_fsstatres_sz (1+NFS3_post_op_attr_sz+13)
+#define NFS3_fsinfores_sz (1+NFS3_post_op_attr_sz+12)
+#define NFS3_pathconfres_sz (1+NFS3_post_op_attr_sz+6)
+#define NFS3_commitres_sz (1+NFS3_wcc_data_sz+2)
/*
* Map file type to S_IFMT bits
diff -puN fs/nfs/nfs4proc.c~nfs-misc-minor-fixes fs/nfs/nfs4proc.c
--- 25/fs/nfs/nfs4proc.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/nfs4proc.c 2004-02-29 14:52:05.000000000 -0800
@@ -506,6 +506,8 @@ nfs4_open_reclaim(struct nfs4_state_owne
status = rpc_call_sync(server->client, &msg, 0);
nfs4_increment_seqid(status, sp);
+ if (status == 0)
+ memcpy(&state->stateid, &o_res.stateid, sizeof(state->stateid));
/* Update the inode attributes */
nfs_refresh_inode(inode, &fattr);
return status;
@@ -690,12 +692,12 @@ nfs4_do_setattr(struct nfs_server *serve
retry:
fattr->valid = 0;
- if (state)
+ if (sattr->ia_valid & ATTR_SIZE)
nfs4_copy_stateid(&arg.stateid, state, 0);
- else
+ else
memcpy(&arg.stateid, &zero_stateid, sizeof(arg.stateid));
- status = rpc_call_sync(server->client, &msg, 0);
+ status = rpc_call_sync(server->client, &msg, 0);
if (status) {
status = nfs4_handle_error(server, status);
if (!status)
@@ -1420,6 +1422,8 @@ nfs4_proc_readdir(struct dentry *dentry,
nfs4_setup_putfh(&compound, NFS_FH(dir));
nfs4_setup_readdir(&compound, cookie, NFS_COOKIEVERF(dir), &page, count, dentry);
status = nfs4_call_compound(&compound, cred, 0);
+ if (status == 0)
+ memcpy(NFS_COOKIEVERF(dir), ops[1].u.readdir.rd_resp_verifier.data, NFS4_VERIFIER_SIZE);
unlock_kernel();
return status;
diff -puN fs/nfs/nfs4state.c~nfs-misc-minor-fixes fs/nfs/nfs4state.c
--- 25/fs/nfs/nfs4state.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/nfs4state.c 2004-02-29 14:52:05.000000000 -0800
@@ -790,7 +790,7 @@ reclaimer(void *ptr)
restart_loop:
spin_lock(&clp->cl_lock);
list_for_each_entry(sp, &clp->cl_state_owners, so_list) {
- if (sp->so_generation - generation <= 0)
+ if (sp->so_generation - generation >= 0)
continue;
atomic_inc(&sp->so_count);
spin_unlock(&clp->cl_lock);
diff -puN fs/nfs/nfs4xdr.c~nfs-misc-minor-fixes fs/nfs/nfs4xdr.c
--- 25/fs/nfs/nfs4xdr.c~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/fs/nfs/nfs4xdr.c 2004-02-29 14:52:05.000000000 -0800
@@ -69,84 +69,84 @@ static int nfs_stat_to_errno(int);
/* lock,open owner id:
* we currently use size 1 (u32) out of (NFS4_OPAQUE_LIMIT >> 2)
*/
-#define owner_id_maxsz 1 + 1
-#define compound_encode_hdr_maxsz 3 + (NFS4_MAXTAGLEN >> 2)
-#define compound_decode_hdr_maxsz 2 + (NFS4_MAXTAGLEN >> 2)
-#define op_encode_hdr_maxsz 1
-#define op_decode_hdr_maxsz 2
-#define encode_putfh_maxsz op_encode_hdr_maxsz + 1 + \
- (NFS4_FHSIZE >> 2)
-#define decode_putfh_maxsz op_decode_hdr_maxsz
-#define encode_putrootfh_maxsz op_encode_hdr_maxsz
-#define decode_putrootfh_maxsz op_decode_hdr_maxsz
-#define encode_getfh_maxsz op_encode_hdr_maxsz
-#define decode_getfh_maxsz op_decode_hdr_maxsz + 1 + \
- (NFS4_FHSIZE >> 2)
-#define encode_getattr_maxsz op_encode_hdr_maxsz + 3
-#define nfs4_fattr_bitmap_maxsz 26 + 2 * ((NFS4_MAXNAMLEN +1) >> 2)
-#define decode_getattr_maxsz op_decode_hdr_maxsz + 3 + \
- nfs4_fattr_bitmap_maxsz
-#define encode_savefh_maxsz op_encode_hdr_maxsz
-#define decode_savefh_maxsz op_decode_hdr_maxsz
-#define encode_restorefh_maxsz op_encode_hdr_maxsz
-#define decode_restorefh_maxsz op_decode_hdr_maxsz
-#define encode_read_getattr_maxsz op_encode_hdr_maxsz + 2
-#define decode_read_getattr_maxsz op_decode_hdr_maxsz + 8
-#define encode_pre_write_getattr_maxsz op_encode_hdr_maxsz + 2
-#define decode_pre_write_getattr_maxsz op_decode_hdr_maxsz + 5
-#define encode_post_write_getattr_maxsz op_encode_hdr_maxsz + 2
-#define decode_post_write_getattr_maxsz op_decode_hdr_maxsz + 13
-#define encode_fsinfo_maxsz op_encode_hdr_maxsz + 2
-#define decode_fsinfo_maxsz op_decode_hdr_maxsz + 11
-#define encode_renew_maxsz op_encode_hdr_maxsz + 3
-#define decode_renew_maxsz op_decode_hdr_maxsz
+#define owner_id_maxsz (1 + 1)
+#define compound_encode_hdr_maxsz (3 + (NFS4_MAXTAGLEN >> 2))
+#define compound_decode_hdr_maxsz (3 + (NFS4_MAXTAGLEN >> 2))
+#define op_encode_hdr_maxsz (1)
+#define op_decode_hdr_maxsz (2)
+#define encode_putfh_maxsz (op_encode_hdr_maxsz + 1 + \
+ (NFS4_FHSIZE >> 2))
+#define decode_putfh_maxsz (op_decode_hdr_maxsz)
+#define encode_putrootfh_maxsz (op_encode_hdr_maxsz)
+#define decode_putrootfh_maxsz (op_decode_hdr_maxsz)
+#define encode_getfh_maxsz (op_encode_hdr_maxsz)
+#define decode_getfh_maxsz (op_decode_hdr_maxsz + 1 + \
+ (NFS4_FHSIZE >> 2))
+#define encode_getattr_maxsz (op_encode_hdr_maxsz + 3)
+#define nfs4_fattr_bitmap_maxsz (26 + 2 * ((NFS4_MAXNAMLEN +1) >> 2))
+#define decode_getattr_maxsz (op_decode_hdr_maxsz + 3 + \
+ nfs4_fattr_bitmap_maxsz)
+#define encode_savefh_maxsz (op_encode_hdr_maxsz)
+#define decode_savefh_maxsz (op_decode_hdr_maxsz)
+#define encode_restorefh_maxsz (op_encode_hdr_maxsz)
+#define decode_restorefh_maxsz (op_decode_hdr_maxsz)
+#define encode_read_getattr_maxsz (op_encode_hdr_maxsz + 2)
+#define decode_read_getattr_maxsz (op_decode_hdr_maxsz + 8)
+#define encode_pre_write_getattr_maxsz (op_encode_hdr_maxsz + 2)
+#define decode_pre_write_getattr_maxsz (op_decode_hdr_maxsz + 5)
+#define encode_post_write_getattr_maxsz (op_encode_hdr_maxsz + 2)
+#define decode_post_write_getattr_maxsz (op_decode_hdr_maxsz + 13)
+#define encode_fsinfo_maxsz (op_encode_hdr_maxsz + 2)
+#define decode_fsinfo_maxsz (op_decode_hdr_maxsz + 11)
+#define encode_renew_maxsz (op_encode_hdr_maxsz + 3)
+#define decode_renew_maxsz (op_decode_hdr_maxsz)
#define encode_setclientid_maxsz \
- op_encode_hdr_maxsz + \
+ (op_encode_hdr_maxsz + \
4 /*server->ip_addr*/ + \
1 /*Netid*/ + \
6 /*uaddr*/ + \
- 6 + (NFS4_VERIFIER_SIZE >> 2)
+ 6 + (NFS4_VERIFIER_SIZE >> 2))
#define decode_setclientid_maxsz \
- op_decode_hdr_maxsz + \
+ (op_decode_hdr_maxsz + \
2 + \
- 1024 /* large value for CLID_INUSE */
+ 1024) /* large value for CLID_INUSE */
#define encode_setclientid_confirm_maxsz \
- op_encode_hdr_maxsz + \
- 3 + (NFS4_VERIFIER_SIZE >> 2)
+ (op_encode_hdr_maxsz + \
+ 3 + (NFS4_VERIFIER_SIZE >> 2))
#define decode_setclientid_confirm_maxsz \
- op_decode_hdr_maxsz
+ (op_decode_hdr_maxsz)
-#define NFS4_enc_compound_sz 1024 /* XXX: large enough? */
-#define NFS4_dec_compound_sz 1024 /* XXX: large enough? */
-#define NFS4_enc_read_sz compound_encode_hdr_maxsz + \
+#define NFS4_enc_compound_sz (1024) /* XXX: large enough? */
+#define NFS4_dec_compound_sz (1024) /* XXX: large enough? */
+#define NFS4_enc_read_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_read_getattr_maxsz + \
- op_encode_hdr_maxsz + 7
-#define NFS4_dec_read_sz compound_decode_hdr_maxsz + \
+ op_encode_hdr_maxsz + 7)
+#define NFS4_dec_read_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_read_getattr_maxsz + \
- op_decode_hdr_maxsz + 2
-#define NFS4_enc_write_sz compound_encode_hdr_maxsz + \
+ op_decode_hdr_maxsz + 2)
+#define NFS4_enc_write_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_pre_write_getattr_maxsz + \
op_encode_hdr_maxsz + 8 + \
- encode_post_write_getattr_maxsz
-#define NFS4_dec_write_sz compound_decode_hdr_maxsz + \
+ encode_post_write_getattr_maxsz)
+#define NFS4_dec_write_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_pre_write_getattr_maxsz + \
op_decode_hdr_maxsz + 4 + \
- decode_post_write_getattr_maxsz
-#define NFS4_enc_commit_sz compound_encode_hdr_maxsz + \
+ decode_post_write_getattr_maxsz)
+#define NFS4_enc_commit_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_pre_write_getattr_maxsz + \
op_encode_hdr_maxsz + 3 + \
- encode_post_write_getattr_maxsz
-#define NFS4_dec_commit_sz compound_decode_hdr_maxsz + \
+ encode_post_write_getattr_maxsz)
+#define NFS4_dec_commit_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_pre_write_getattr_maxsz + \
op_decode_hdr_maxsz + 2 + \
- decode_post_write_getattr_maxsz
-#define NFS4_enc_open_sz compound_encode_hdr_maxsz + \
+ decode_post_write_getattr_maxsz)
+#define NFS4_enc_open_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_savefh_maxsz + \
op_encode_hdr_maxsz + \
@@ -154,107 +154,107 @@ static int nfs_stat_to_errno(int);
encode_getattr_maxsz + \
encode_getfh_maxsz + \
encode_restorefh_maxsz + \
- encode_getattr_maxsz
-#define NFS4_dec_open_sz compound_decode_hdr_maxsz + \
+ encode_getattr_maxsz)
+#define NFS4_dec_open_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_savefh_maxsz + \
op_decode_hdr_maxsz + 4 + 5 + 2 + 3 + \
decode_getattr_maxsz + \
decode_getfh_maxsz + \
decode_restorefh_maxsz + \
- decode_getattr_maxsz
+ decode_getattr_maxsz)
#define NFS4_enc_open_confirm_sz \
- compound_encode_hdr_maxsz + \
+ (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
- op_encode_hdr_maxsz + 5
-#define NFS4_dec_open_confirm_sz compound_decode_hdr_maxsz + \
+ op_encode_hdr_maxsz + 5)
+#define NFS4_dec_open_confirm_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
- op_decode_hdr_maxsz + 4
-#define NFS4_enc_open_reclaim_sz compound_encode_hdr_maxsz + \
+ op_decode_hdr_maxsz + 4)
+#define NFS4_enc_open_reclaim_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
op_encode_hdr_maxsz + \
11 + \
- encode_getattr_maxsz
-#define NFS4_dec_open_reclaim_sz compound_decode_hdr_maxsz + \
+ encode_getattr_maxsz)
+#define NFS4_dec_open_reclaim_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
op_decode_hdr_maxsz + \
4 + 5 + 2 + 3 + \
- decode_getattr_maxsz
+ decode_getattr_maxsz)
#define NFS4_enc_open_downgrade_sz \
- compound_encode_hdr_maxsz + \
+ (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
- op_encode_hdr_maxsz + 7
+ op_encode_hdr_maxsz + 7)
#define NFS4_dec_open_downgrade_sz \
- compound_decode_hdr_maxsz + \
+ (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
- op_decode_hdr_maxsz + 4
-#define NFS4_enc_close_sz compound_encode_hdr_maxsz + \
+ op_decode_hdr_maxsz + 4)
+#define NFS4_enc_close_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
- op_encode_hdr_maxsz + 5
-#define NFS4_dec_close_sz compound_decode_hdr_maxsz + \
+ op_encode_hdr_maxsz + 5)
+#define NFS4_dec_close_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
- op_decode_hdr_maxsz + 4
-#define NFS4_enc_setattr_sz compound_encode_hdr_maxsz + \
+ op_decode_hdr_maxsz + 4)
+#define NFS4_enc_setattr_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
op_encode_hdr_maxsz + 4 + \
nfs4_fattr_bitmap_maxsz + \
- encode_getattr_maxsz
-#define NFS4_dec_setattr_sz compound_decode_hdr_maxsz + \
+ encode_getattr_maxsz)
+#define NFS4_dec_setattr_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
- op_decode_hdr_maxsz + 3
-#define NFS4_enc_fsinfo_sz compound_encode_hdr_maxsz + \
+ op_decode_hdr_maxsz + 3)
+#define NFS4_enc_fsinfo_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
- encode_fsinfo_maxsz
-#define NFS4_dec_fsinfo_sz compound_decode_hdr_maxsz + \
+ encode_fsinfo_maxsz)
+#define NFS4_dec_fsinfo_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
- decode_fsinfo_maxsz
-#define NFS4_enc_renew_sz compound_encode_hdr_maxsz + \
- encode_renew_maxsz
-#define NFS4_dec_renew_sz compound_decode_hdr_maxsz + \
- decode_renew_maxsz
-#define NFS4_enc_setclientid_sz compound_encode_hdr_maxsz + \
- encode_setclientid_maxsz
-#define NFS4_dec_setclientid_sz compound_decode_hdr_maxsz + \
- decode_setclientid_maxsz
+ decode_fsinfo_maxsz)
+#define NFS4_enc_renew_sz (compound_encode_hdr_maxsz + \
+ encode_renew_maxsz)
+#define NFS4_dec_renew_sz (compound_decode_hdr_maxsz + \
+ decode_renew_maxsz)
+#define NFS4_enc_setclientid_sz (compound_encode_hdr_maxsz + \
+ encode_setclientid_maxsz)
+#define NFS4_dec_setclientid_sz (compound_decode_hdr_maxsz + \
+ decode_setclientid_maxsz)
#define NFS4_enc_setclientid_confirm_sz \
- compound_encode_hdr_maxsz + \
+ (compound_encode_hdr_maxsz + \
encode_setclientid_confirm_maxsz + \
encode_putrootfh_maxsz + \
- encode_fsinfo_maxsz
+ encode_fsinfo_maxsz)
#define NFS4_dec_setclientid_confirm_sz \
- compound_decode_hdr_maxsz + \
+ (compound_decode_hdr_maxsz + \
decode_setclientid_confirm_maxsz + \
decode_putrootfh_maxsz + \
- decode_fsinfo_maxsz
-#define NFS4_enc_lock_sz compound_encode_hdr_maxsz + \
+ decode_fsinfo_maxsz)
+#define NFS4_enc_lock_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_getattr_maxsz + \
op_encode_hdr_maxsz + \
1 + 1 + 2 + 2 + \
1 + 4 + 1 + 2 + \
- owner_id_maxsz
-#define NFS4_dec_lock_sz compound_decode_hdr_maxsz + \
+ owner_id_maxsz)
+#define NFS4_dec_lock_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_getattr_maxsz + \
op_decode_hdr_maxsz + \
2 + 2 + 1 + 2 + \
- owner_id_maxsz
-#define NFS4_enc_lockt_sz compound_encode_hdr_maxsz + \
+ owner_id_maxsz)
+#define NFS4_enc_lockt_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_getattr_maxsz + \
op_encode_hdr_maxsz + \
1 + 2 + 2 + 2 + \
- owner_id_maxsz
-#define NFS4_dec_lockt_sz NFS4_dec_lock_sz
-#define NFS4_enc_locku_sz compound_encode_hdr_maxsz + \
+ owner_id_maxsz)
+#define NFS4_dec_lockt_sz (NFS4_dec_lock_sz)
+#define NFS4_enc_locku_sz (compound_encode_hdr_maxsz + \
encode_putfh_maxsz + \
encode_getattr_maxsz + \
op_encode_hdr_maxsz + \
- 1 + 1 + 4 + 2 + 2
-#define NFS4_dec_locku_sz compound_decode_hdr_maxsz + \
+ 1 + 1 + 4 + 2 + 2)
+#define NFS4_dec_locku_sz (compound_decode_hdr_maxsz + \
decode_putfh_maxsz + \
decode_getattr_maxsz + \
- op_decode_hdr_maxsz + 4
+ op_decode_hdr_maxsz + 4)
@@ -3165,6 +3165,10 @@ static struct {
{ NFS4ERR_SYMLINK, ELOOP },
{ NFS4ERR_OP_ILLEGAL, EOPNOTSUPP },
{ NFS4ERR_DEADLOCK, EDEADLK },
+ { NFS4ERR_WRONGSEC, EPERM }, /* FIXME: this needs
+ * to be handled by a
+ * middle-layer.
+ */
{ -1, EIO }
};
diff -puN include/linux/lockd/debug.h~nfs-misc-minor-fixes include/linux/lockd/debug.h
--- 25/include/linux/lockd/debug.h~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/include/linux/lockd/debug.h 2004-02-29 14:52:05.000000000 -0800
@@ -23,7 +23,7 @@
#undef ifdebug
#if defined(RPC_DEBUG) && defined(LOCKD_DEBUG)
-# define ifdebug(flag) if (nlm_debug & NLMDBG_##flag)
+# define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag))
#else
# define ifdebug(flag) if (0)
#endif
diff -puN include/linux/nfs_fs.h~nfs-misc-minor-fixes include/linux/nfs_fs.h
--- 25/include/linux/nfs_fs.h~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/include/linux/nfs_fs.h 2004-02-29 14:52:05.000000000 -0800
@@ -691,7 +691,7 @@ struct nfs4_mount_data;
#ifdef __KERNEL__
# undef ifdebug
# ifdef NFS_DEBUG
-# define ifdebug(fac) if (nfs_debug & NFSDBG_##fac)
+# define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac))
# else
# define ifdebug(fac) if (0)
# endif
diff -puN include/linux/sunrpc/debug.h~nfs-misc-minor-fixes include/linux/sunrpc/debug.h
--- 25/include/linux/sunrpc/debug.h~nfs-misc-minor-fixes 2004-02-29 14:52:05.000000000 -0800
+++ 25-akpm/include/linux/sunrpc/debug.h 2004-02-29 14:52:05.000000000 -0800
@@ -54,7 +54,7 @@ extern unsigned int nlm_debug;
#undef ifdebug
#ifdef RPC_DEBUG
-# define ifdebug(fac) if (rpc_debug & RPCDBG_##fac)
+# define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac))
# define dfprintk(fac, args...) do { ifdebug(fac) printk(args); } while(0)
# define RPC_IFDEBUG(x) x
#else
_