patch-2.4.10 linux/fs/nfsd/vfs.c
Next file: linux/fs/ntfs/Makefile
Previous file: linux/fs/nfsd/nfssvc.c
Back to the patch index
Back to the overall index
- Lines: 43
- Date:
Thu Sep 20 21:02:01 2001
- Orig file:
v2.4.9/linux/fs/nfsd/vfs.c
- Orig date:
Tue Jul 3 17:08:21 2001
diff -u --recursive --new-file v2.4.9/linux/fs/nfsd/vfs.c linux/fs/nfsd/vfs.c
@@ -98,7 +98,7 @@
struct dentry *dentry;
int err;
- dprintk("nfsd: nfsd_lookup(fh %s, %*.*s)\n", SVCFH_fmt(fhp), len,len,name);
+ dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);
/* Obtain dentry and export. */
err = fh_verify(rqstp, fhp, S_IFDIR, MAY_EXEC);
@@ -481,6 +481,7 @@
filp->f_op = fops_get(inode->i_fop);
atomic_set(&filp->f_count, 1);
filp->f_dentry = dentry;
+ filp->f_vfsmnt = fhp->fh_export->ex_mnt;
if (access & MAY_WRITE) {
filp->f_flags = O_WRONLY|O_LARGEFILE;
filp->f_mode = FMODE_WRITE;
@@ -1178,7 +1179,7 @@
*/
int
nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
- char *fname, int len, struct svc_fh *tfhp)
+ char *name, int len, struct svc_fh *tfhp)
{
struct dentry *ddir, *dnew, *dold;
struct inode *dirp, *dest;
@@ -1195,14 +1196,14 @@
if (!len)
goto out;
err = nfserr_exist;
- if (isdotent(fname, len))
+ if (isdotent(name, len))
goto out;
fh_lock(ffhp);
ddir = ffhp->fh_dentry;
dirp = ddir->d_inode;
- dnew = lookup_one_len(fname, ddir, len);
+ dnew = lookup_one_len(name, ddir, len);
err = PTR_ERR(dnew);
if (IS_ERR(dnew))
goto out_nfserr;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)