nfsd4: remove unused macro
Subsystems (2)
PATCH 1/2 nfsd4: remove unused macro
From: "J. Bruce Fields" <[email protected]>
Cleanup a piece I forgot to remove in 9411b1d4c7df26dca6bc6261b5dc87a5b4c81e5c "nfsd4: cleanup handling of nfsv4.0 closed stateid's".
--- fs/nfsd/nfs4xdr.c | 19 ------------------- 1 file changed, 19 deletions(-)
fs/nfsd/nfs4xdr.c +0 -19
@@ -1693,14 +1693,6 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) } while (0)#define ADJUST_ARGS () resp->p = p -/* -* Header routine to setup seqid operation replay cache -*/ -#define ENCODE_SEQID_OP_HEAD \ - __be32 *save; \ - \ - save = resp->p; -/* Encode as an array of strings the string given with components * separated @sep, escaped with esc_enter and esc_exit. */
@@ -2640,8 +2632,6 @@ static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp,static __be32 nfsd4_encode_close (struct nfsd4_compoundres *resp,__be32 nfserr,struct nfsd4_close *close) { -ENCODE_SEQID_OP_HEAD ; -if (!nfserr)nfsd4_encode_stateid (resp, &close->cl_stateid);
@@ -2740,8 +2730,6 @@ nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_deniestatic __be32 nfsd4_encode_lock (struct nfsd4_compoundres *resp,__be32 nfserr,struct nfsd4_lock *lock) { -ENCODE_SEQID_OP_HEAD ; -if (!nfserr)nfsd4_encode_stateid (resp, &lock->lk_resp_stateid);else if (nfserr == nfserr_denied)
@@ -2761,8 +2749,6 @@ nfsd4_encode_lockt(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lstatic __be32 nfsd4_encode_locku (struct nfsd4_compoundres *resp,__be32 nfserr,struct nfsd4_locku *locku) { -ENCODE_SEQID_OP_HEAD ; -if (!nfserr)nfsd4_encode_stateid (resp, &locku->lu_stateid);
@@ -2788,7 +2774,6 @@ static __be32 nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open) { __be32 *p; -ENCODE_SEQID_OP_HEAD ;if (nfserr) goto out;
@@ -2866,8 +2851,6 @@ out:static __be32 nfsd4_encode_open_confirm (struct nfsd4_compoundres *resp,__be32 nfserr,struct nfsd4_open_confirm *oc) { -ENCODE_SEQID_OP_HEAD ; -if (!nfserr)nfsd4_encode_stateid (resp, &oc->oc_resp_stateid);
@@ -2877,8 +2860,6 @@ nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, structstatic __be32 nfsd4_encode_open_downgrade (struct nfsd4_compoundres *resp,__be32 nfserr,struct nfsd4_open_downgrade *od) { -ENCODE_SEQID_OP_HEAD ; -if (!nfserr)nfsd4_encode_stateid (resp, &od->od_stateid);
Signature · 1 line
1.7.9.5
PATCH 2/2 nfsd: fix EXDEV checking in rename
From: "J. Bruce Fields" <[email protected]>
We again check for the EXDEV a little later on, so the first check is redundant. This check is also slightly racier, since a badly timed eviction from the export cache could leave us with the two fh_export pointers pointing to two different cache entries which each refer to the same underlying export.
It's better to compare vfsmounts as the later check does, but that leaves a minor security hole in the case where the two exports refer to two different directories especially if (for example) they have different root-squashing options.
So, compare ex_path.dentry too.
--- fs/nfsd/vfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/nfsd/vfs.c +2 -4
@@ -1758,10 +1758,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, tdentry = tfhp->fh_dentry; tdir = tdentry->d_inode; - err = (rqstp->rq_vers ==2 ) ? nfserr_acces : nfserr_xdev; -if (ffhp->fh_export != tfhp->fh_export) - goto out; - err = nfserr_perm;if (!flen ||isdotent (fname, flen) || !tlen ||isdotent (tname, tlen)) goto out;
@@ -1802,6 +1798,8 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, host_err = -EXDEV ;if (ffhp->fh_export->ex_path.mnt != tfhp->fh_export->ex_path.mnt) goto out_dput_new; +if (ffhp->fh_export->ex_path.dentry != tfhp->fh_export->ex_path.dentry) + goto out_dput_new; host_err =nfsd_break_lease (odentry->d_inode);if (host_err)
Signature · 1 line
1.7.9.5