From d3e71cb08747743fce908122bab08b479eb403a5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 27 Mar 2000 23:54:12 +0000 Subject: Merge with Linux 2.3.99-pre3. --- fs/nfsd/nfsproc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'fs/nfsd/nfsproc.c') diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 6f69225cc..5c312b906 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -223,9 +223,10 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, goto done; fh_lock(dirfhp); dchild = lookup_one(argp->name, dget(dirfhp->fh_dentry)); - nfserr = nfserrno(PTR_ERR(dchild)); - if (IS_ERR(dchild)) + if (IS_ERR(dchild)) { + nfserr = nfserrno(PTR_ERR(dchild)); goto out_unlock; + } fh_init(newfhp, NFS_FHSIZE); nfserr = fh_compose(newfhp, dirfhp->fh_export, dchild); if (!nfserr && !dchild->d_inode) -- cgit v1.2.3