Commit 14168d67 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

NFSD: Remove the RETURN_STATUS() macro

Refactor: I'm about to change the return value from .pc_func. Clear
the way by replacing the RETURN_STATUS() macro with logic that
plants the status code directly into the response structure.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent f0af2210
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include "xdr3.h" #include "xdr3.h"
#include "vfs.h" #include "vfs.h"
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
/* /*
* NULL call. * NULL call.
*/ */
...@@ -34,17 +32,18 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp) ...@@ -34,17 +32,18 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp)
struct posix_acl *acl; struct posix_acl *acl;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
__be32 nfserr = 0;
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP); resp->status = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP);
if (nfserr) if (resp->status != nfs_ok)
RETURN_STATUS(nfserr); goto out;
inode = d_inode(fh->fh_dentry); inode = d_inode(fh->fh_dentry);
if (argp->mask & ~NFS_ACL_MASK) if (argp->mask & ~NFS_ACL_MASK) {
RETURN_STATUS(nfserr_inval); resp->status = nfserr_inval;
goto out;
}
resp->mask = argp->mask; resp->mask = argp->mask;
if (resp->mask & (NFS_ACL|NFS_ACLCNT)) { if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
...@@ -54,7 +53,7 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp) ...@@ -54,7 +53,7 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp)
acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
} }
if (IS_ERR(acl)) { if (IS_ERR(acl)) {
nfserr = nfserrno(PTR_ERR(acl)); resp->status = nfserrno(PTR_ERR(acl));
goto fail; goto fail;
} }
resp->acl_access = acl; resp->acl_access = acl;
...@@ -64,19 +63,20 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp) ...@@ -64,19 +63,20 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp)
of a non-directory! */ of a non-directory! */
acl = get_acl(inode, ACL_TYPE_DEFAULT); acl = get_acl(inode, ACL_TYPE_DEFAULT);
if (IS_ERR(acl)) { if (IS_ERR(acl)) {
nfserr = nfserrno(PTR_ERR(acl)); resp->status = nfserrno(PTR_ERR(acl));
goto fail; goto fail;
} }
resp->acl_default = acl; resp->acl_default = acl;
} }
/* resp->acl_{access,default} are released in nfs3svc_release_getacl. */ /* resp->acl_{access,default} are released in nfs3svc_release_getacl. */
RETURN_STATUS(0); out:
return resp->status;
fail: fail:
posix_acl_release(resp->acl_access); posix_acl_release(resp->acl_access);
posix_acl_release(resp->acl_default); posix_acl_release(resp->acl_default);
RETURN_STATUS(nfserr); goto out;
} }
/* /*
...@@ -88,12 +88,11 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp) ...@@ -88,12 +88,11 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
struct nfsd3_attrstat *resp = rqstp->rq_resp; struct nfsd3_attrstat *resp = rqstp->rq_resp;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
__be32 nfserr = 0;
int error; int error;
fh = fh_copy(&resp->fh, &argp->fh); fh = fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR); resp->status = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);
if (nfserr) if (resp->status != nfs_ok)
goto out; goto out;
inode = d_inode(fh->fh_dentry); inode = d_inode(fh->fh_dentry);
...@@ -113,13 +112,13 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp) ...@@ -113,13 +112,13 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
fh_unlock(fh); fh_unlock(fh);
fh_drop_write(fh); fh_drop_write(fh);
out_errno: out_errno:
nfserr = nfserrno(error); resp->status = nfserrno(error);
out: out:
/* argp->acl_{access,default} may have been allocated in /* argp->acl_{access,default} may have been allocated in
nfs3svc_decode_setaclargs. */ nfs3svc_decode_setaclargs. */
posix_acl_release(argp->acl_access); posix_acl_release(argp->acl_access);
posix_acl_release(argp->acl_default); posix_acl_release(argp->acl_default);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#define NFSDDBG_FACILITY NFSDDBG_PROC #define NFSDDBG_FACILITY NFSDDBG_PROC
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
static int nfs3_ftypes[] = { static int nfs3_ftypes[] = {
0, /* NF3NON */ 0, /* NF3NON */
S_IFREG, /* NF3REG */ S_IFREG, /* NF3REG */
...@@ -45,20 +43,19 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp) ...@@ -45,20 +43,19 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp)
{ {
struct nfsd_fhandle *argp = rqstp->rq_argp; struct nfsd_fhandle *argp = rqstp->rq_argp;
struct nfsd3_attrstat *resp = rqstp->rq_resp; struct nfsd3_attrstat *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: GETATTR(3) %s\n", dprintk("nfsd: GETATTR(3) %s\n",
SVCFH_fmt(&argp->fh)); SVCFH_fmt(&argp->fh));
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = fh_verify(rqstp, &resp->fh, 0, resp->status = fh_verify(rqstp, &resp->fh, 0,
NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT); NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT);
if (nfserr) if (resp->status != nfs_ok)
RETURN_STATUS(nfserr); goto out;
nfserr = fh_getattr(&resp->fh, &resp->stat);
RETURN_STATUS(nfserr); resp->status = fh_getattr(&resp->fh, &resp->stat);
out:
return resp->status;
} }
/* /*
...@@ -69,15 +66,14 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp) ...@@ -69,15 +66,14 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp)
{ {
struct nfsd3_sattrargs *argp = rqstp->rq_argp; struct nfsd3_sattrargs *argp = rqstp->rq_argp;
struct nfsd3_attrstat *resp = rqstp->rq_resp; struct nfsd3_attrstat *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: SETATTR(3) %s\n", dprintk("nfsd: SETATTR(3) %s\n",
SVCFH_fmt(&argp->fh)); SVCFH_fmt(&argp->fh));
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = nfsd_setattr(rqstp, &resp->fh, &argp->attrs, resp->status = nfsd_setattr(rqstp, &resp->fh, &argp->attrs,
argp->check_guard, argp->guardtime); argp->check_guard, argp->guardtime);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -88,7 +84,6 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp) ...@@ -88,7 +84,6 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp)
{ {
struct nfsd3_diropargs *argp = rqstp->rq_argp; struct nfsd3_diropargs *argp = rqstp->rq_argp;
struct nfsd3_diropres *resp = rqstp->rq_resp; struct nfsd3_diropres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: LOOKUP(3) %s %.*s\n", dprintk("nfsd: LOOKUP(3) %s %.*s\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -98,11 +93,10 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp) ...@@ -98,11 +93,10 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp)
fh_copy(&resp->dirfh, &argp->fh); fh_copy(&resp->dirfh, &argp->fh);
fh_init(&resp->fh, NFS3_FHSIZE); fh_init(&resp->fh, NFS3_FHSIZE);
nfserr = nfsd_lookup(rqstp, &resp->dirfh, resp->status = nfsd_lookup(rqstp, &resp->dirfh,
argp->name, argp->name, argp->len,
argp->len,
&resp->fh); &resp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -113,7 +107,6 @@ nfsd3_proc_access(struct svc_rqst *rqstp) ...@@ -113,7 +107,6 @@ nfsd3_proc_access(struct svc_rqst *rqstp)
{ {
struct nfsd3_accessargs *argp = rqstp->rq_argp; struct nfsd3_accessargs *argp = rqstp->rq_argp;
struct nfsd3_accessres *resp = rqstp->rq_resp; struct nfsd3_accessres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: ACCESS(3) %s 0x%x\n", dprintk("nfsd: ACCESS(3) %s 0x%x\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -121,8 +114,8 @@ nfsd3_proc_access(struct svc_rqst *rqstp) ...@@ -121,8 +114,8 @@ nfsd3_proc_access(struct svc_rqst *rqstp)
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
resp->access = argp->access; resp->access = argp->access;
nfserr = nfsd_access(rqstp, &resp->fh, &resp->access, NULL); resp->status = nfsd_access(rqstp, &resp->fh, &resp->access, NULL);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -133,15 +126,14 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp) ...@@ -133,15 +126,14 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp)
{ {
struct nfsd3_readlinkargs *argp = rqstp->rq_argp; struct nfsd3_readlinkargs *argp = rqstp->rq_argp;
struct nfsd3_readlinkres *resp = rqstp->rq_resp; struct nfsd3_readlinkres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: READLINK(3) %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: READLINK(3) %s\n", SVCFH_fmt(&argp->fh));
/* Read the symlink. */ /* Read the symlink. */
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
resp->len = NFS3_MAXPATHLEN; resp->len = NFS3_MAXPATHLEN;
nfserr = nfsd_readlink(rqstp, &resp->fh, argp->buffer, &resp->len); resp->status = nfsd_readlink(rqstp, &resp->fh, argp->buffer, &resp->len);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -152,7 +144,6 @@ nfsd3_proc_read(struct svc_rqst *rqstp) ...@@ -152,7 +144,6 @@ nfsd3_proc_read(struct svc_rqst *rqstp)
{ {
struct nfsd3_readargs *argp = rqstp->rq_argp; struct nfsd3_readargs *argp = rqstp->rq_argp;
struct nfsd3_readres *resp = rqstp->rq_resp; struct nfsd3_readres *resp = rqstp->rq_resp;
__be32 nfserr;
u32 max_blocksize = svc_max_payload(rqstp); u32 max_blocksize = svc_max_payload(rqstp);
unsigned long cnt = min(argp->count, max_blocksize); unsigned long cnt = min(argp->count, max_blocksize);
...@@ -169,12 +160,10 @@ nfsd3_proc_read(struct svc_rqst *rqstp) ...@@ -169,12 +160,10 @@ nfsd3_proc_read(struct svc_rqst *rqstp)
svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4); svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = nfsd_read(rqstp, &resp->fh, resp->status = nfsd_read(rqstp, &resp->fh, argp->offset,
argp->offset, rqstp->rq_vec, argp->vlen, &resp->count,
rqstp->rq_vec, argp->vlen,
&resp->count,
&resp->eof); &resp->eof);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -185,7 +174,6 @@ nfsd3_proc_write(struct svc_rqst *rqstp) ...@@ -185,7 +174,6 @@ nfsd3_proc_write(struct svc_rqst *rqstp)
{ {
struct nfsd3_writeargs *argp = rqstp->rq_argp; struct nfsd3_writeargs *argp = rqstp->rq_argp;
struct nfsd3_writeres *resp = rqstp->rq_resp; struct nfsd3_writeres *resp = rqstp->rq_resp;
__be32 nfserr;
unsigned long cnt = argp->len; unsigned long cnt = argp->len;
unsigned int nvecs; unsigned int nvecs;
...@@ -199,13 +187,16 @@ nfsd3_proc_write(struct svc_rqst *rqstp) ...@@ -199,13 +187,16 @@ nfsd3_proc_write(struct svc_rqst *rqstp)
resp->committed = argp->stable; resp->committed = argp->stable;
nvecs = svc_fill_write_vector(rqstp, rqstp->rq_arg.pages, nvecs = svc_fill_write_vector(rqstp, rqstp->rq_arg.pages,
&argp->first, cnt); &argp->first, cnt);
if (!nvecs) if (!nvecs) {
RETURN_STATUS(nfserr_io); resp->status = nfserr_io;
nfserr = nfsd_write(rqstp, &resp->fh, argp->offset, goto out;
}
resp->status = nfsd_write(rqstp, &resp->fh, argp->offset,
rqstp->rq_vec, nvecs, &cnt, rqstp->rq_vec, nvecs, &cnt,
resp->committed, resp->verf); resp->committed, resp->verf);
resp->count = cnt; resp->count = cnt;
RETURN_STATUS(nfserr); out:
return resp->status;
} }
/* /*
...@@ -220,7 +211,6 @@ nfsd3_proc_create(struct svc_rqst *rqstp) ...@@ -220,7 +211,6 @@ nfsd3_proc_create(struct svc_rqst *rqstp)
struct nfsd3_diropres *resp = rqstp->rq_resp; struct nfsd3_diropres *resp = rqstp->rq_resp;
svc_fh *dirfhp, *newfhp = NULL; svc_fh *dirfhp, *newfhp = NULL;
struct iattr *attr; struct iattr *attr;
__be32 nfserr;
dprintk("nfsd: CREATE(3) %s %.*s\n", dprintk("nfsd: CREATE(3) %s %.*s\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -241,11 +231,10 @@ nfsd3_proc_create(struct svc_rqst *rqstp) ...@@ -241,11 +231,10 @@ nfsd3_proc_create(struct svc_rqst *rqstp)
} }
/* Now create the file and set attributes */ /* Now create the file and set attributes */
nfserr = do_nfsd_create(rqstp, dirfhp, argp->name, argp->len, resp->status = do_nfsd_create(rqstp, dirfhp, argp->name, argp->len,
attr, newfhp, attr, newfhp, argp->createmode,
argp->createmode, (u32 *)argp->verf, NULL, NULL); (u32 *)argp->verf, NULL, NULL);
return resp->status;
RETURN_STATUS(nfserr);
} }
/* /*
...@@ -256,7 +245,6 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp) ...@@ -256,7 +245,6 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp)
{ {
struct nfsd3_createargs *argp = rqstp->rq_argp; struct nfsd3_createargs *argp = rqstp->rq_argp;
struct nfsd3_diropres *resp = rqstp->rq_resp; struct nfsd3_diropres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: MKDIR(3) %s %.*s\n", dprintk("nfsd: MKDIR(3) %s %.*s\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -266,10 +254,10 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp) ...@@ -266,10 +254,10 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp)
argp->attrs.ia_valid &= ~ATTR_SIZE; argp->attrs.ia_valid &= ~ATTR_SIZE;
fh_copy(&resp->dirfh, &argp->fh); fh_copy(&resp->dirfh, &argp->fh);
fh_init(&resp->fh, NFS3_FHSIZE); fh_init(&resp->fh, NFS3_FHSIZE);
nfserr = nfsd_create(rqstp, &resp->dirfh, argp->name, argp->len, resp->status = nfsd_create(rqstp, &resp->dirfh, argp->name, argp->len,
&argp->attrs, S_IFDIR, 0, &resp->fh); &argp->attrs, S_IFDIR, 0, &resp->fh);
fh_unlock(&resp->dirfh); fh_unlock(&resp->dirfh);
RETURN_STATUS(nfserr); return resp->status;
} }
static __be32 static __be32
...@@ -277,18 +265,23 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp) ...@@ -277,18 +265,23 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp)
{ {
struct nfsd3_symlinkargs *argp = rqstp->rq_argp; struct nfsd3_symlinkargs *argp = rqstp->rq_argp;
struct nfsd3_diropres *resp = rqstp->rq_resp; struct nfsd3_diropres *resp = rqstp->rq_resp;
__be32 nfserr;
if (argp->tlen == 0) if (argp->tlen == 0) {
RETURN_STATUS(nfserr_inval); resp->status = nfserr_inval;
if (argp->tlen > NFS3_MAXPATHLEN) goto out;
RETURN_STATUS(nfserr_nametoolong); }
if (argp->tlen > NFS3_MAXPATHLEN) {
resp->status = nfserr_nametoolong;
goto out;
}
argp->tname = svc_fill_symlink_pathname(rqstp, &argp->first, argp->tname = svc_fill_symlink_pathname(rqstp, &argp->first,
page_address(rqstp->rq_arg.pages[0]), page_address(rqstp->rq_arg.pages[0]),
argp->tlen); argp->tlen);
if (IS_ERR(argp->tname)) if (IS_ERR(argp->tname)) {
RETURN_STATUS(nfserrno(PTR_ERR(argp->tname))); resp->status = nfserrno(PTR_ERR(argp->tname));
goto out;
}
dprintk("nfsd: SYMLINK(3) %s %.*s -> %.*s\n", dprintk("nfsd: SYMLINK(3) %s %.*s -> %.*s\n",
SVCFH_fmt(&argp->ffh), SVCFH_fmt(&argp->ffh),
...@@ -297,10 +290,11 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp) ...@@ -297,10 +290,11 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp)
fh_copy(&resp->dirfh, &argp->ffh); fh_copy(&resp->dirfh, &argp->ffh);
fh_init(&resp->fh, NFS3_FHSIZE); fh_init(&resp->fh, NFS3_FHSIZE);
nfserr = nfsd_symlink(rqstp, &resp->dirfh, argp->fname, argp->flen, resp->status = nfsd_symlink(rqstp, &resp->dirfh, argp->fname,
argp->tname, &resp->fh); argp->flen, argp->tname, &resp->fh);
kfree(argp->tname); kfree(argp->tname);
RETURN_STATUS(nfserr); out:
return resp->status;
} }
/* /*
...@@ -311,7 +305,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) ...@@ -311,7 +305,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp)
{ {
struct nfsd3_mknodargs *argp = rqstp->rq_argp; struct nfsd3_mknodargs *argp = rqstp->rq_argp;
struct nfsd3_diropres *resp = rqstp->rq_resp; struct nfsd3_diropres *resp = rqstp->rq_resp;
__be32 nfserr;
int type; int type;
dev_t rdev = 0; dev_t rdev = 0;
...@@ -323,22 +316,28 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) ...@@ -323,22 +316,28 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp)
fh_copy(&resp->dirfh, &argp->fh); fh_copy(&resp->dirfh, &argp->fh);
fh_init(&resp->fh, NFS3_FHSIZE); fh_init(&resp->fh, NFS3_FHSIZE);
if (argp->ftype == 0 || argp->ftype >= NF3BAD) if (argp->ftype == 0 || argp->ftype >= NF3BAD) {
RETURN_STATUS(nfserr_inval); resp->status = nfserr_inval;
goto out;
}
if (argp->ftype == NF3CHR || argp->ftype == NF3BLK) { if (argp->ftype == NF3CHR || argp->ftype == NF3BLK) {
rdev = MKDEV(argp->major, argp->minor); rdev = MKDEV(argp->major, argp->minor);
if (MAJOR(rdev) != argp->major || if (MAJOR(rdev) != argp->major ||
MINOR(rdev) != argp->minor) MINOR(rdev) != argp->minor) {
RETURN_STATUS(nfserr_inval); resp->status = nfserr_inval;
} else goto out;
if (argp->ftype != NF3SOCK && argp->ftype != NF3FIFO) }
RETURN_STATUS(nfserr_inval); } else if (argp->ftype != NF3SOCK && argp->ftype != NF3FIFO) {
resp->status = nfserr_inval;
goto out;
}
type = nfs3_ftypes[argp->ftype]; type = nfs3_ftypes[argp->ftype];
nfserr = nfsd_create(rqstp, &resp->dirfh, argp->name, argp->len, resp->status = nfsd_create(rqstp, &resp->dirfh, argp->name, argp->len,
&argp->attrs, type, rdev, &resp->fh); &argp->attrs, type, rdev, &resp->fh);
fh_unlock(&resp->dirfh); fh_unlock(&resp->dirfh);
RETURN_STATUS(nfserr); out:
return resp->status;
} }
/* /*
...@@ -349,7 +348,6 @@ nfsd3_proc_remove(struct svc_rqst *rqstp) ...@@ -349,7 +348,6 @@ nfsd3_proc_remove(struct svc_rqst *rqstp)
{ {
struct nfsd3_diropargs *argp = rqstp->rq_argp; struct nfsd3_diropargs *argp = rqstp->rq_argp;
struct nfsd3_attrstat *resp = rqstp->rq_resp; struct nfsd3_attrstat *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: REMOVE(3) %s %.*s\n", dprintk("nfsd: REMOVE(3) %s %.*s\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -358,9 +356,10 @@ nfsd3_proc_remove(struct svc_rqst *rqstp) ...@@ -358,9 +356,10 @@ nfsd3_proc_remove(struct svc_rqst *rqstp)
/* Unlink. -S_IFDIR means file must not be a directory */ /* Unlink. -S_IFDIR means file must not be a directory */
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = nfsd_unlink(rqstp, &resp->fh, -S_IFDIR, argp->name, argp->len); resp->status = nfsd_unlink(rqstp, &resp->fh, -S_IFDIR,
argp->name, argp->len);
fh_unlock(&resp->fh); fh_unlock(&resp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -371,7 +370,6 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp) ...@@ -371,7 +370,6 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp)
{ {
struct nfsd3_diropargs *argp = rqstp->rq_argp; struct nfsd3_diropargs *argp = rqstp->rq_argp;
struct nfsd3_attrstat *resp = rqstp->rq_resp; struct nfsd3_attrstat *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: RMDIR(3) %s %.*s\n", dprintk("nfsd: RMDIR(3) %s %.*s\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
...@@ -379,9 +377,10 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp) ...@@ -379,9 +377,10 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp)
argp->name); argp->name);
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = nfsd_unlink(rqstp, &resp->fh, S_IFDIR, argp->name, argp->len); resp->status = nfsd_unlink(rqstp, &resp->fh, S_IFDIR,
argp->name, argp->len);
fh_unlock(&resp->fh); fh_unlock(&resp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
static __be32 static __be32
...@@ -389,7 +388,6 @@ nfsd3_proc_rename(struct svc_rqst *rqstp) ...@@ -389,7 +388,6 @@ nfsd3_proc_rename(struct svc_rqst *rqstp)
{ {
struct nfsd3_renameargs *argp = rqstp->rq_argp; struct nfsd3_renameargs *argp = rqstp->rq_argp;
struct nfsd3_renameres *resp = rqstp->rq_resp; struct nfsd3_renameres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: RENAME(3) %s %.*s ->\n", dprintk("nfsd: RENAME(3) %s %.*s ->\n",
SVCFH_fmt(&argp->ffh), SVCFH_fmt(&argp->ffh),
...@@ -402,9 +400,9 @@ nfsd3_proc_rename(struct svc_rqst *rqstp) ...@@ -402,9 +400,9 @@ nfsd3_proc_rename(struct svc_rqst *rqstp)
fh_copy(&resp->ffh, &argp->ffh); fh_copy(&resp->ffh, &argp->ffh);
fh_copy(&resp->tfh, &argp->tfh); fh_copy(&resp->tfh, &argp->tfh);
nfserr = nfsd_rename(rqstp, &resp->ffh, argp->fname, argp->flen, resp->status = nfsd_rename(rqstp, &resp->ffh, argp->fname, argp->flen,
&resp->tfh, argp->tname, argp->tlen); &resp->tfh, argp->tname, argp->tlen);
RETURN_STATUS(nfserr); return resp->status;
} }
static __be32 static __be32
...@@ -412,7 +410,6 @@ nfsd3_proc_link(struct svc_rqst *rqstp) ...@@ -412,7 +410,6 @@ nfsd3_proc_link(struct svc_rqst *rqstp)
{ {
struct nfsd3_linkargs *argp = rqstp->rq_argp; struct nfsd3_linkargs *argp = rqstp->rq_argp;
struct nfsd3_linkres *resp = rqstp->rq_resp; struct nfsd3_linkres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: LINK(3) %s ->\n", dprintk("nfsd: LINK(3) %s ->\n",
SVCFH_fmt(&argp->ffh)); SVCFH_fmt(&argp->ffh));
...@@ -423,9 +420,9 @@ nfsd3_proc_link(struct svc_rqst *rqstp) ...@@ -423,9 +420,9 @@ nfsd3_proc_link(struct svc_rqst *rqstp)
fh_copy(&resp->fh, &argp->ffh); fh_copy(&resp->fh, &argp->ffh);
fh_copy(&resp->tfh, &argp->tfh); fh_copy(&resp->tfh, &argp->tfh);
nfserr = nfsd_link(rqstp, &resp->tfh, argp->tname, argp->tlen, resp->status = nfsd_link(rqstp, &resp->tfh, argp->tname, argp->tlen,
&resp->fh); &resp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -436,7 +433,6 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp) ...@@ -436,7 +433,6 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)
{ {
struct nfsd3_readdirargs *argp = rqstp->rq_argp; struct nfsd3_readdirargs *argp = rqstp->rq_argp;
struct nfsd3_readdirres *resp = rqstp->rq_resp; struct nfsd3_readdirres *resp = rqstp->rq_resp;
__be32 nfserr;
int count = 0; int count = 0;
struct page **p; struct page **p;
caddr_t page_addr = NULL; caddr_t page_addr = NULL;
...@@ -456,7 +452,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp) ...@@ -456,7 +452,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)
resp->common.err = nfs_ok; resp->common.err = nfs_ok;
resp->buffer = argp->buffer; resp->buffer = argp->buffer;
resp->rqstp = rqstp; resp->rqstp = rqstp;
nfserr = nfsd_readdir(rqstp, &resp->fh, (loff_t*) &argp->cookie, resp->status = nfsd_readdir(rqstp, &resp->fh, (loff_t *)&argp->cookie,
&resp->common, nfs3svc_encode_entry); &resp->common, nfs3svc_encode_entry);
memcpy(resp->verf, argp->verf, 8); memcpy(resp->verf, argp->verf, 8);
count = 0; count = 0;
...@@ -485,7 +481,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp) ...@@ -485,7 +481,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)
resp->offset = NULL; resp->offset = NULL;
} }
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -497,7 +493,6 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp) ...@@ -497,7 +493,6 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)
{ {
struct nfsd3_readdirargs *argp = rqstp->rq_argp; struct nfsd3_readdirargs *argp = rqstp->rq_argp;
struct nfsd3_readdirres *resp = rqstp->rq_resp; struct nfsd3_readdirres *resp = rqstp->rq_resp;
__be32 nfserr;
int count = 0; int count = 0;
loff_t offset; loff_t offset;
struct page **p; struct page **p;
...@@ -520,17 +515,17 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp) ...@@ -520,17 +515,17 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)
resp->rqstp = rqstp; resp->rqstp = rqstp;
offset = argp->cookie; offset = argp->cookie;
nfserr = fh_verify(rqstp, &resp->fh, S_IFDIR, NFSD_MAY_NOP); resp->status = fh_verify(rqstp, &resp->fh, S_IFDIR, NFSD_MAY_NOP);
if (nfserr) if (resp->status != nfs_ok)
RETURN_STATUS(nfserr); goto out;
if (resp->fh.fh_export->ex_flags & NFSEXP_NOREADDIRPLUS) if (resp->fh.fh_export->ex_flags & NFSEXP_NOREADDIRPLUS) {
RETURN_STATUS(nfserr_notsupp); resp->status = nfserr_notsupp;
goto out;
}
nfserr = nfsd_readdir(rqstp, &resp->fh, resp->status = nfsd_readdir(rqstp, &resp->fh, &offset,
&offset, &resp->common, nfs3svc_encode_entry_plus);
&resp->common,
nfs3svc_encode_entry_plus);
memcpy(resp->verf, argp->verf, 8); memcpy(resp->verf, argp->verf, 8);
for (p = rqstp->rq_respages + 1; p < rqstp->rq_next_page; p++) { for (p = rqstp->rq_respages + 1; p < rqstp->rq_next_page; p++) {
page_addr = page_address(*p); page_addr = page_address(*p);
...@@ -555,7 +550,8 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp) ...@@ -555,7 +550,8 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)
resp->offset = NULL; resp->offset = NULL;
} }
RETURN_STATUS(nfserr); out:
return resp->status;
} }
/* /*
...@@ -566,14 +562,13 @@ nfsd3_proc_fsstat(struct svc_rqst *rqstp) ...@@ -566,14 +562,13 @@ nfsd3_proc_fsstat(struct svc_rqst *rqstp)
{ {
struct nfsd_fhandle *argp = rqstp->rq_argp; struct nfsd_fhandle *argp = rqstp->rq_argp;
struct nfsd3_fsstatres *resp = rqstp->rq_resp; struct nfsd3_fsstatres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: FSSTAT(3) %s\n", dprintk("nfsd: FSSTAT(3) %s\n",
SVCFH_fmt(&argp->fh)); SVCFH_fmt(&argp->fh));
nfserr = nfsd_statfs(rqstp, &argp->fh, &resp->stats, 0); resp->status = nfsd_statfs(rqstp, &argp->fh, &resp->stats, 0);
fh_put(&argp->fh); fh_put(&argp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -584,7 +579,6 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp) ...@@ -584,7 +579,6 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp)
{ {
struct nfsd_fhandle *argp = rqstp->rq_argp; struct nfsd_fhandle *argp = rqstp->rq_argp;
struct nfsd3_fsinfores *resp = rqstp->rq_resp; struct nfsd3_fsinfores *resp = rqstp->rq_resp;
__be32 nfserr;
u32 max_blocksize = svc_max_payload(rqstp); u32 max_blocksize = svc_max_payload(rqstp);
dprintk("nfsd: FSINFO(3) %s\n", dprintk("nfsd: FSINFO(3) %s\n",
...@@ -600,13 +594,13 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp) ...@@ -600,13 +594,13 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp)
resp->f_maxfilesize = ~(u32) 0; resp->f_maxfilesize = ~(u32) 0;
resp->f_properties = NFS3_FSF_DEFAULT; resp->f_properties = NFS3_FSF_DEFAULT;
nfserr = fh_verify(rqstp, &argp->fh, 0, resp->status = fh_verify(rqstp, &argp->fh, 0,
NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT); NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT);
/* Check special features of the file system. May request /* Check special features of the file system. May request
* different read/write sizes for file systems known to have * different read/write sizes for file systems known to have
* problems with large blocks */ * problems with large blocks */
if (nfserr == 0) { if (resp->status == nfs_ok) {
struct super_block *sb = argp->fh.fh_dentry->d_sb; struct super_block *sb = argp->fh.fh_dentry->d_sb;
/* Note that we don't care for remote fs's here */ /* Note that we don't care for remote fs's here */
...@@ -617,7 +611,7 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp) ...@@ -617,7 +611,7 @@ nfsd3_proc_fsinfo(struct svc_rqst *rqstp)
} }
fh_put(&argp->fh); fh_put(&argp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
...@@ -628,7 +622,6 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp) ...@@ -628,7 +622,6 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp)
{ {
struct nfsd_fhandle *argp = rqstp->rq_argp; struct nfsd_fhandle *argp = rqstp->rq_argp;
struct nfsd3_pathconfres *resp = rqstp->rq_resp; struct nfsd3_pathconfres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: PATHCONF(3) %s\n", dprintk("nfsd: PATHCONF(3) %s\n",
SVCFH_fmt(&argp->fh)); SVCFH_fmt(&argp->fh));
...@@ -641,9 +634,9 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp) ...@@ -641,9 +634,9 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp)
resp->p_case_insensitive = 0; resp->p_case_insensitive = 0;
resp->p_case_preserving = 1; resp->p_case_preserving = 1;
nfserr = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP); resp->status = fh_verify(rqstp, &argp->fh, 0, NFSD_MAY_NOP);
if (nfserr == 0) { if (resp->status == nfs_ok) {
struct super_block *sb = argp->fh.fh_dentry->d_sb; struct super_block *sb = argp->fh.fh_dentry->d_sb;
/* Note that we don't care for remote fs's here */ /* Note that we don't care for remote fs's here */
...@@ -660,10 +653,9 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp) ...@@ -660,10 +653,9 @@ nfsd3_proc_pathconf(struct svc_rqst *rqstp)
} }
fh_put(&argp->fh); fh_put(&argp->fh);
RETURN_STATUS(nfserr); return resp->status;
} }
/* /*
* Commit a file (range) to stable storage. * Commit a file (range) to stable storage.
*/ */
...@@ -672,21 +664,22 @@ nfsd3_proc_commit(struct svc_rqst *rqstp) ...@@ -672,21 +664,22 @@ nfsd3_proc_commit(struct svc_rqst *rqstp)
{ {
struct nfsd3_commitargs *argp = rqstp->rq_argp; struct nfsd3_commitargs *argp = rqstp->rq_argp;
struct nfsd3_commitres *resp = rqstp->rq_resp; struct nfsd3_commitres *resp = rqstp->rq_resp;
__be32 nfserr;
dprintk("nfsd: COMMIT(3) %s %u@%Lu\n", dprintk("nfsd: COMMIT(3) %s %u@%Lu\n",
SVCFH_fmt(&argp->fh), SVCFH_fmt(&argp->fh),
argp->count, argp->count,
(unsigned long long) argp->offset); (unsigned long long) argp->offset);
if (argp->offset > NFS_OFFSET_MAX) if (argp->offset > NFS_OFFSET_MAX) {
RETURN_STATUS(nfserr_inval); resp->status = nfserr_inval;
goto out;
}
fh_copy(&resp->fh, &argp->fh); fh_copy(&resp->fh, &argp->fh);
nfserr = nfsd_commit(rqstp, &resp->fh, argp->offset, argp->count, resp->status = nfsd_commit(rqstp, &resp->fh, argp->offset,
resp->verf); argp->count, resp->verf);
out:
RETURN_STATUS(nfserr); return resp->status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment