patch-2.3.6 linux/fs/nfsd/nfsfh.c
Next file: linux/fs/ntfs/fs.c
Previous file: linux/fs/nfsd/export.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Tue Jun 8 10:47:58 1999
- Orig file:
v2.3.5/linux/fs/nfsd/nfsfh.c
- Orig date:
Sat May 15 23:46:04 1999
diff -u --recursive --new-file v2.3.5/linux/fs/nfsd/nfsfh.c linux/fs/nfsd/nfsfh.c
@@ -436,7 +436,7 @@
dir = iget(sb, dirino);
if (!dir)
goto out_root;
- dentry = d_alloc_root(dir, NULL);
+ dentry = d_alloc_root(dir);
if (!dentry)
goto out_iput;
@@ -531,7 +531,7 @@
* Add the parent to the dir cache before releasing the dentry,
* and check whether to save a copy of the dentry's path.
*/
- if (dentry != dentry->d_parent) {
+ if (!IS_ROOT(dentry)) {
struct dentry *parent = dget(dentry->d_parent);
if (add_to_fhcache(parent, NFSD_DIR_CACHE))
nfsd_nr_verified++;
@@ -1140,7 +1140,7 @@
error = nfserr_stale;
dprintk("fh_verify: no root_squashed access.\n");
}
- } while ((tdentry != tdentry->d_parent));
+ } while (!IS_ROOT(tdentry));
if (exp->ex_dentry != tdentry) {
error = nfserr_stale;
printk("nfsd Security: %s/%s bad export.\n",
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)