diff options
| author | Miles Bader <miles@gnu.org> | 1997-02-06 08:35:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1997-02-06 08:35:55 +0000 |
| commit | 3cabd08fb1de1600354091b5a195557bef548217 (patch) | |
| tree | acc956705a7f7b2226e4cf84be892ec353059f0b /libdiskfs/dir-renamed.c | |
| parent | b8125e04cfab0ed8f92a50f6a8f241dc6389b511 (diff) | |
(checkpath, diskfs_rename_dir):
Supply DEPTH & NEW_DEPTH arguments to diskfs_lookup.
Diffstat (limited to 'libdiskfs/dir-renamed.c')
| -rw-r--r-- | libdiskfs/dir-renamed.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libdiskfs/dir-renamed.c b/libdiskfs/dir-renamed.c index 6ef96ee3..06af702f 100644 --- a/libdiskfs/dir-renamed.c +++ b/libdiskfs/dir-renamed.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1994, 1995, 1996 Free Software Foundation + Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ checkpath(struct node *source, /* nothing */; /* This special lookup does a diskfs_nput on its first argument when it succeeds. */ - err = diskfs_lookup (np, "..", LOOKUP | SPEC_DOTDOT, &np, 0, cred)) + err = diskfs_lookup (np, "..", LOOKUP | SPEC_DOTDOT, &np, 0, cred, 1, 0)) { if (err) { @@ -93,8 +93,9 @@ diskfs_rename_dir (struct node *fdp, struct node *fnp, char *fromname, /* 1: Lookup target; if it exists, make sure it's an empty directory. */ ds = buf; - err = diskfs_lookup (tdp, toname, RENAME, &tnp, ds, tocred); - + err = diskfs_lookup (tdp, toname, RENAME, &tnp, ds, tocred, 0, 0); + assert (err != EAGAIN); /* <-> assert (TONAME != "..") */ + if (tnp == fnp) { diskfs_drop_dirstat (tdp, ds); @@ -134,7 +135,7 @@ diskfs_rename_dir (struct node *fdp, struct node *fnp, char *fromname, tmpds = alloca (diskfs_dirstat_size); err = diskfs_lookup (fnp, "..", RENAME | SPEC_DOTDOT, - &tmpnp, tmpds, fromcred); + &tmpnp, tmpds, fromcred, 1, 0); assert (err != ENOENT); assert (tmpnp == fdp); if (err) @@ -197,7 +198,7 @@ diskfs_rename_dir (struct node *fdp, struct node *fnp, char *fromname, /* 4: Remove the entry in fdp. */ ds = buf; mutex_unlock (&fnp->lock); - err = diskfs_lookup (fdp, fromname, REMOVE, &tmpnp, ds, fromcred); + err = diskfs_lookup (fdp, fromname, REMOVE, &tmpnp, ds, fromcred, 1, 0); assert (tmpnp == fnp); diskfs_nrele (tmpnp); if (err) |