*
* %sccs.include.redist.c%
*
- * @(#)ufs_lookup.c 7.34 (Berkeley) %G%
+ * @(#)ufs_lookup.c 7.50 (Berkeley) %G%
*/
#include <sys/param.h>
int dirchk = 0;
#endif
+#define FSFMT(vp) ((vp)->v_mount->mnt_maxsymlinklen <= 0)
+
/*
* Convert a component of a pathname into a pointer to a locked inode.
* This is a very central and rather complicated routine.
* If the file system is not maintained in a strict tree hierarchy,
* this can result in a deadlock situation (see comments in code below).
*
- * The flag argument is LOOKUP, CREATE, RENAME, or DELETE depending on
- * whether the name is to be looked up, created, renamed, or deleted.
+ * The cnp->cn_nameiop argument is LOOKUP, CREATE, RENAME, or DELETE depending
+ * on whether the name is to be looked up, created, renamed, or deleted.
* When CREATE, RENAME, or DELETE is specified, information usable in
* creating, renaming, or deleting a directory entry may be calculated.
* If flag has LOCKPARENT or'ed into it and the target of the pathname
* NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
*/
int
-ufs_lookup(vdp, ndp, p)
- register struct vnode *vdp;
- register struct nameidata *ndp;
- struct proc *p;
+ufs_lookup(ap)
+ struct vop_lookup_args /* {
+ struct vnode *a_dvp;
+ struct vnode **a_vpp;
+ struct componentname *a_cnp;
+ } */ *ap;
{
- register struct inode *dp; /* the directory we are searching */
- register struct ufsmount *ump; /* file system that directory is in */
+ register struct vnode *vdp; /* vnode for directory being searched */
+ register struct inode *dp; /* inode for directory being searched */
struct buf *bp; /* a buffer of directory entries */
register struct direct *ep; /* the current directory entry */
int entryoffsetinblock; /* offset of ep in bp's buffer */
enum {NONE, COMPACT, FOUND} slotstatus;
- int slotoffset; /* offset of area with free space */
+ doff_t slotoffset; /* offset of area with free space */
int slotsize; /* size of area at slotoffset */
int slotfreespace; /* amount of space free in slot */
int slotneeded; /* size of the entry we're seeking */
int numdirpasses; /* strategy for directory search */
- int endsearch; /* offset to end directory search */
- int prevoff; /* prev entry ndp->ni_ufs.ufs_offset */
+ doff_t endsearch; /* offset to end directory search */
+ doff_t prevoff; /* prev entry dp->i_offset */
struct inode *pdp; /* saved dp during symlink work */
- struct inode *tdp; /* returned by iget */
- off_t enduseful; /* pointer past last used dir slot */
+ struct vnode *tdp; /* returned by VFS_VGET */
+ doff_t enduseful; /* pointer past last used dir slot */
u_long bmask; /* block offset mask */
- int flag; /* LOOKUP, CREATE, RENAME, or DELETE */
int lockparent; /* 1 => lockparent flag is set */
int wantparent; /* 1 => wantparent or lockparent flag */
- int error;
+ int namlen, error;
+ struct vnode **vpp = ap->a_vpp;
+ struct componentname *cnp = ap->a_cnp;
+ struct ucred *cred = cnp->cn_cred;
+ int flags = cnp->cn_flags;
+ int nameiop = cnp->cn_nameiop;
bp = NULL;
slotoffset = -1;
- ndp->ni_dvp = vdp;
- ndp->ni_vp = NULL;
+ *vpp = NULL;
+ vdp = ap->a_dvp;
dp = VTOI(vdp);
- ump = VFSTOUFS(vdp->v_mount);
- lockparent = ndp->ni_nameiop & LOCKPARENT;
- flag = ndp->ni_nameiop & OPMASK;
- wantparent = ndp->ni_nameiop & (LOCKPARENT|WANTPARENT);
+ lockparent = flags & LOCKPARENT;
+ wantparent = flags & (LOCKPARENT|WANTPARENT);
/*
* Check accessiblity of directory.
*/
- if ((dp->i_mode&IFMT) != IFDIR)
+ if ((dp->i_mode & IFMT) != IFDIR)
return (ENOTDIR);
- if (error = ufs_access(vdp, VEXEC, ndp->ni_cred, p))
+ if (error = VOP_ACCESS(vdp, VEXEC, cred, cnp->cn_proc))
return (error);
/*
* check the name cache to see if the directory/name pair
* we are looking for is known already.
*/
- if (error = cache_lookup(ndp)) {
+ if (error = cache_lookup(vdp, vpp, cnp)) {
int vpid; /* capability number of vnode */
if (error == ENOENT)
return (error);
-#ifdef PARANOID
- if (vdp == ndp->ni_rdir && ndp->ni_isdotdot)
- panic("ufs_lookup: .. through root");
-#endif
/*
* Get the next vnode in the path.
* See comment below starting `Step through' for
* an explaination of the locking protocol.
*/
pdp = dp;
- dp = VTOI(ndp->ni_vp);
- vdp = ndp->ni_vp;
+ dp = VTOI(*vpp);
+ vdp = *vpp;
vpid = vdp->v_id;
- if (pdp == dp) {
+ if (pdp == dp) { /* lookup on "." */
VREF(vdp);
error = 0;
- } else if (ndp->ni_isdotdot) {
+ } else if (flags & ISDOTDOT) {
IUNLOCK(pdp);
error = vget(vdp);
- if (!error && lockparent && *ndp->ni_next == '\0')
+ if (!error && lockparent && (flags & ISLASTCN))
ILOCK(pdp);
} else {
error = vget(vdp);
- if (!lockparent || error || *ndp->ni_next != '\0')
+ if (!lockparent || error || !(flags & ISLASTCN))
IUNLOCK(pdp);
}
/*
if (vpid == vdp->v_id)
return (0);
ufs_iput(dp);
- if (lockparent && pdp != dp && *ndp->ni_next == '\0')
+ if (lockparent && pdp != dp &&
+ (flags & ISLASTCN))
IUNLOCK(pdp);
}
ILOCK(pdp);
dp = pdp;
vdp = ITOV(dp);
- ndp->ni_vp = NULL;
+ *vpp = NULL;
}
/*
* case it doesn't already exist.
*/
slotstatus = FOUND;
- if ((flag == CREATE || flag == RENAME) && *ndp->ni_next == 0) {
+ slotfreespace = slotsize = slotneeded = 0;
+ if ((nameiop == CREATE || nameiop == RENAME) &&
+ (flags & ISLASTCN)) {
slotstatus = NONE;
- slotfreespace = 0;
- slotneeded = ((sizeof (struct direct) - (MAXNAMLEN + 1)) +
- ((ndp->ni_namelen + 1 + 3) &~ 3));
+ slotneeded = (sizeof(struct direct) - MAXNAMLEN +
+ cnp->cn_namelen + 3) &~ 3;
}
/*
* profiling time and hence has been removed in the interest
* of simplicity.
*/
- bmask = ump->um_mountp->mnt_stat.f_bsize - 1;
- if (flag != LOOKUP || dp->i_diroff == 0 || dp->i_diroff > dp->i_size) {
- ndp->ni_ufs.ufs_offset = 0;
+ bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
+ if (nameiop != LOOKUP || dp->i_diroff == 0 ||
+ dp->i_diroff > dp->i_size) {
+ entryoffsetinblock = 0;
+ dp->i_offset = 0;
numdirpasses = 1;
} else {
- ndp->ni_ufs.ufs_offset = dp->i_diroff;
- if ((entryoffsetinblock = ndp->ni_ufs.ufs_offset & bmask) &&
- (error = (ump->um_blkatoff)
- (dp, ndp->ni_ufs.ufs_offset, NULL, &bp)))
+ dp->i_offset = dp->i_diroff;
+ if ((entryoffsetinblock = dp->i_offset & bmask) &&
+ (error = VOP_BLKATOFF(vdp, (off_t)dp->i_offset, NULL, &bp)))
return (error);
numdirpasses = 2;
nchstats.ncs_2passes++;
}
+ prevoff = dp->i_offset;
endsearch = roundup(dp->i_size, DIRBLKSIZ);
enduseful = 0;
searchloop:
- while (ndp->ni_ufs.ufs_offset < endsearch) {
+ while (dp->i_offset < endsearch) {
/*
* If offset is on a block boundary, read the next directory
* block. Release previous if it exists.
*/
- if ((ndp->ni_ufs.ufs_offset & bmask) == 0) {
+ if ((dp->i_offset & bmask) == 0) {
if (bp != NULL)
brelse(bp);
- if (error = (ump->um_blkatoff)
- (dp, ndp->ni_ufs.ufs_offset, NULL, &bp))
+ if (error =
+ VOP_BLKATOFF(vdp, (off_t)dp->i_offset, NULL, &bp))
return (error);
entryoffsetinblock = 0;
}
*/
ep = (struct direct *)(bp->b_un.b_addr + entryoffsetinblock);
if (ep->d_reclen == 0 ||
- dirchk && ufs_dirbadentry(ep, entryoffsetinblock)) {
+ dirchk && ufs_dirbadentry(vdp, ep, entryoffsetinblock)) {
int i;
- ufs_dirbad(dp, ndp->ni_ufs.ufs_offset, "mangled entry");
+ ufs_dirbad(dp, dp->i_offset, "mangled entry");
i = DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1));
- ndp->ni_ufs.ufs_offset += i;
+ dp->i_offset += i;
entryoffsetinblock += i;
continue;
}
int size = ep->d_reclen;
if (ep->d_ino != 0)
- size -= DIRSIZ(ep);
+ size -= DIRSIZ(FSFMT(vdp), ep);
if (size > 0) {
if (size >= slotneeded) {
slotstatus = FOUND;
- slotoffset = ndp->ni_ufs.ufs_offset;
+ slotoffset = dp->i_offset;
slotsize = ep->d_reclen;
} else if (slotstatus == NONE) {
slotfreespace += size;
if (slotoffset == -1)
- slotoffset =
- ndp->ni_ufs.ufs_offset;
+ slotoffset = dp->i_offset;
if (slotfreespace >= slotneeded) {
slotstatus = COMPACT;
- slotsize =
- ndp->ni_ufs.ufs_offset +
+ slotsize = dp->i_offset +
ep->d_reclen - slotoffset;
}
}
* Check for a name match.
*/
if (ep->d_ino) {
- if (ep->d_namlen == ndp->ni_namelen &&
- !bcmp(ndp->ni_ptr, ep->d_name,
- (unsigned)ep->d_namlen)) {
+# if (BYTE_ORDER == LITTLE_ENDIAN)
+ if (vdp->v_mount->mnt_maxsymlinklen > 0)
+ namlen = ep->d_namlen;
+ else
+ namlen = ep->d_type;
+# else
+ namlen = ep->d_namlen;
+# endif
+ if (namlen == cnp->cn_namelen &&
+ !bcmp(cnp->cn_nameptr, ep->d_name,
+ (unsigned)namlen)) {
/*
* Save directory entry's inode number and
* reclen in ndp->ni_ufs area, and release
* directory buffer.
*/
- ndp->ni_ufs.ufs_ino = ep->d_ino;
- ndp->ni_ufs.ufs_reclen = ep->d_reclen;
+ dp->i_ino = ep->d_ino;
+ dp->i_reclen = ep->d_reclen;
brelse(bp);
goto found;
}
}
- prevoff = ndp->ni_ufs.ufs_offset;
- ndp->ni_ufs.ufs_offset += ep->d_reclen;
+ prevoff = dp->i_offset;
+ dp->i_offset += ep->d_reclen;
entryoffsetinblock += ep->d_reclen;
if (ep->d_ino)
- enduseful = ndp->ni_ufs.ufs_offset;
+ enduseful = dp->i_offset;
}
/* notfound: */
/*
*/
if (numdirpasses == 2) {
numdirpasses--;
- ndp->ni_ufs.ufs_offset = 0;
+ dp->i_offset = 0;
endsearch = dp->i_diroff;
goto searchloop;
}
* directory has not been removed, then can consider
* allowing file to be created.
*/
- if ((flag == CREATE || flag == RENAME) &&
- *ndp->ni_next == 0 && dp->i_nlink != 0) {
+ if ((nameiop == CREATE || nameiop == RENAME) &&
+ (flags & ISLASTCN) && dp->i_nlink != 0) {
/*
* Access for write is interpreted as allowing
* creation of files in the directory.
*/
- if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))
+ if (error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_proc))
return (error);
/*
* Return an indication of where the new directory
* entry should be put. If we didn't find a slot,
- * then set ndp->ni_ufs.ufs_count to 0 indicating
+ * then set dp->i_count to 0 indicating
* that the new slot belongs at the end of the
* directory. If we found a slot, then the new entry
- * can be put in the range from ndp->ni_ufs.ufs_offset
- * to ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count.
+ * can be put in the range from dp->i_offset to
+ * dp->i_offset + dp->i_count.
*/
if (slotstatus == NONE) {
- ndp->ni_ufs.ufs_offset = roundup(dp->i_size, DIRBLKSIZ);
- ndp->ni_ufs.ufs_count = 0;
- enduseful = ndp->ni_ufs.ufs_offset;
+ dp->i_offset = roundup(dp->i_size, DIRBLKSIZ);
+ dp->i_count = 0;
+ enduseful = dp->i_offset;
} else {
- ndp->ni_ufs.ufs_offset = slotoffset;
- ndp->ni_ufs.ufs_count = slotsize;
+ dp->i_offset = slotoffset;
+ dp->i_count = slotsize;
if (enduseful < slotoffset + slotsize)
enduseful = slotoffset + slotsize;
}
- ndp->ni_ufs.ufs_endoff = roundup(enduseful, DIRBLKSIZ);
+ dp->i_endoff = roundup(enduseful, DIRBLKSIZ);
dp->i_flag |= IUPD|ICHG;
/*
* We return with the directory locked, so that
* NB - if the directory is unlocked, then this
* information cannot be used.
*/
- ndp->ni_nameiop |= SAVENAME;
+ cnp->cn_flags |= SAVENAME;
if (!lockparent)
IUNLOCK(dp);
+ return (EJUSTRETURN);
}
/*
* Insert name into cache (as non-existent) if appropriate.
*/
- if (ndp->ni_makeentry && flag != CREATE)
- cache_enter(ndp);
+ if ((flags & MAKEENTRY) && nameiop != CREATE)
+ cache_enter(vdp, *vpp, cnp);
return (ENOENT);
found:
* Check that directory length properly reflects presence
* of this entry.
*/
- if (entryoffsetinblock + DIRSIZ(ep) > dp->i_size) {
- ufs_dirbad(dp, ndp->ni_ufs.ufs_offset, "i_size too small");
- dp->i_size = entryoffsetinblock + DIRSIZ(ep);
+ if (entryoffsetinblock + DIRSIZ(FSFMT(vdp), ep) > dp->i_size) {
+ ufs_dirbad(dp, dp->i_offset, "i_size too small");
+ dp->i_size = entryoffsetinblock + DIRSIZ(FSFMT(vdp), ep);
dp->i_flag |= IUPD|ICHG;
}
* If the final component of path name, save information
* in the cache as to where the entry was found.
*/
- if (*ndp->ni_next == '\0' && flag == LOOKUP)
- dp->i_diroff = ndp->ni_ufs.ufs_offset &~ (DIRBLKSIZ - 1);
+ if ((flags & ISLASTCN) && nameiop == LOOKUP)
+ dp->i_diroff = dp->i_offset &~ (DIRBLKSIZ - 1);
/*
* If deleting, and at end of pathname, return
* the directory (in ndp->ni_dvp), otherwise we go
* on and lock the inode, being careful with ".".
*/
- if (flag == DELETE && *ndp->ni_next == 0) {
+ if (nameiop == DELETE && (flags & ISLASTCN)) {
/*
* Write access to directory required to delete files.
*/
- if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))
+ if (error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_proc))
return (error);
/*
- * Return pointer to current entry in ndp->ni_ufs.ufs_offset,
+ * Return pointer to current entry in dp->i_offset,
* and distance past previous entry (if there
- * is a previous entry in this block) in ndp->ni_ufs.ufs_count.
+ * is a previous entry in this block) in dp->i_count.
* Save directory inode pointer in ndp->ni_dvp for dirremove().
*/
- if ((ndp->ni_ufs.ufs_offset&(DIRBLKSIZ-1)) == 0)
- ndp->ni_ufs.ufs_count = 0;
+ if ((dp->i_offset & (DIRBLKSIZ - 1)) == 0)
+ dp->i_count = 0;
else
- ndp->ni_ufs.ufs_count =
- ndp->ni_ufs.ufs_offset - prevoff;
- if (dp->i_number == ndp->ni_ufs.ufs_ino) {
+ dp->i_count = dp->i_offset - prevoff;
+ if (dp->i_number == dp->i_ino) {
VREF(vdp);
- ndp->ni_vp = vdp;
+ *vpp = vdp;
return (0);
}
- if (error = (ump->um_iget)(dp, ndp->ni_ufs.ufs_ino, &tdp))
+ if (error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp))
return (error);
/*
* If directory is "sticky", then user must own
* implements append-only directories.
*/
if ((dp->i_mode & ISVTX) &&
- ndp->ni_cred->cr_uid != 0 &&
- ndp->ni_cred->cr_uid != dp->i_uid &&
- tdp->i_uid != ndp->ni_cred->cr_uid) {
- ufs_iput(tdp);
+ cred->cr_uid != 0 &&
+ cred->cr_uid != dp->i_uid &&
+ VTOI(tdp)->i_uid != cred->cr_uid) {
+ vput(tdp);
return (EPERM);
}
- ndp->ni_vp = ITOV(tdp);
+ *vpp = tdp;
if (!lockparent)
IUNLOCK(dp);
return (0);
* Must get inode of directory entry to verify it's a
* regular file, or empty directory.
*/
- if (flag == RENAME && wantparent && *ndp->ni_next == 0) {
- if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))
+ if (nameiop == RENAME && wantparent &&
+ (flags & ISLASTCN)) {
+ if (error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_proc))
return (error);
/*
* Careful about locking second inode.
* This can only occur if the target is ".".
*/
- if (dp->i_number == ndp->ni_ufs.ufs_ino)
+ if (dp->i_number == dp->i_ino)
return (EISDIR);
- if (error = (ump->um_iget)(dp, ndp->ni_ufs.ufs_ino, &tdp))
+ if (error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp))
return (error);
- ndp->ni_vp = ITOV(tdp);
- ndp->ni_nameiop |= SAVENAME;
+ *vpp = tdp;
+ cnp->cn_flags |= SAVENAME;
if (!lockparent)
IUNLOCK(dp);
return (0);
* that point backwards in the directory structure.
*/
pdp = dp;
- if (ndp->ni_isdotdot) {
+ if (flags & ISDOTDOT) {
IUNLOCK(pdp); /* race to get the inode */
- if (error = (ump->um_iget)(dp, ndp->ni_ufs.ufs_ino, &tdp)) {
+ if (error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp)) {
ILOCK(pdp);
return (error);
}
- if (lockparent && *ndp->ni_next == '\0')
+ if (lockparent && (flags & ISLASTCN))
ILOCK(pdp);
- ndp->ni_vp = ITOV(tdp);
- } else if (dp->i_number == ndp->ni_ufs.ufs_ino) {
+ *vpp = tdp;
+ } else if (dp->i_number == dp->i_ino) {
VREF(vdp); /* we want ourself, ie "." */
- ndp->ni_vp = vdp;
+ *vpp = vdp;
} else {
- if (error = (ump->um_iget)(dp, ndp->ni_ufs.ufs_ino, &tdp))
+ if (error = VFS_VGET(vdp->v_mount, dp->i_ino, &tdp))
return (error);
- if (!lockparent || *ndp->ni_next != '\0')
+ if (!lockparent || !(flags & ISLASTCN))
IUNLOCK(pdp);
- ndp->ni_vp = ITOV(tdp);
+ *vpp = tdp;
}
/*
* Insert name into cache if appropriate.
*/
- if (ndp->ni_makeentry)
- cache_enter(ndp);
+ if (flags & MAKEENTRY)
+ cache_enter(vdp, *vpp, cnp);
return (0);
}
void
ufs_dirbad(ip, offset, how)
struct inode *ip;
- off_t offset;
+ doff_t offset;
char *how;
{
struct mount *mp;
* name must be as long as advertised, and null terminated
*/
int
-ufs_dirbadentry(ep, entryoffsetinblock)
+ufs_dirbadentry(dp, ep, entryoffsetinblock)
+ struct vnode *dp;
register struct direct *ep;
int entryoffsetinblock;
{
register int i;
+ int namlen;
+# if (BYTE_ORDER == LITTLE_ENDIAN)
+ if (dp->v_mount->mnt_maxsymlinklen > 0)
+ namlen = ep->d_namlen;
+ else
+ namlen = ep->d_type;
+# else
+ namlen = ep->d_namlen;
+# endif
if ((ep->d_reclen & 0x3) != 0 ||
ep->d_reclen > DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)) ||
- ep->d_reclen < DIRSIZ(ep) || ep->d_namlen > MAXNAMLEN) {
+ ep->d_reclen < DIRSIZ(FSFMT(dp), ep) || namlen > MAXNAMLEN) {
/*return (1); */
printf("First bad\n");
goto bad;
}
- for (i = 0; i < ep->d_namlen; i++)
+ for (i = 0; i < namlen; i++)
if (ep->d_name[i] == '\0') {
/*return (1); */
printf("Second bad\n");
goto bad;
return (ep->d_name[i]);
bad:
-printf("ufs_dirbadentry: jumping out: reclen: %d namlen %d ino %d name %s\n",
- ep->d_reclen, ep->d_namlen, ep->d_ino, ep->d_name );
return(1);
}
/*
* Write a directory entry after a call to namei, using the parameters
* that it left in nameidata. The argument ip is the inode which the new
- * directory entry will refer to. The nameidata field ndp->ni_dvp is a
- * pointer to the directory to be written, which was left locked by namei.
- * Remaining parameters (ndp->ni_ufs.ufs_offset, ndp->ni_ufs.ufs_count)
- * indicate how the space for the new entry is to be obtained.
+ * directory entry will refer to. Dvp is a pointer to the directory to
+ * be written, which was left locked by namei. Remaining parameters
+ * (dp->i_offset, dp->i_count) indicate how the space for the new
+ * entry is to be obtained.
*/
int
-ufs_direnter(ip, ndp)
+ufs_direnter(ip, dvp, cnp)
struct inode *ip;
- register struct nameidata *ndp;
+ struct vnode *dvp;
+ register struct componentname *cnp;
{
register struct direct *ep, *nep;
register struct inode *dp;
struct buf *bp;
struct direct newdir;
struct iovec aiov;
- struct ufsmount *ump;
struct uio auio;
u_int dsize;
int error, loc, newentrysize, spacefree;
char *dirbuf;
#ifdef DIAGNOSTIC
- if ((ndp->ni_nameiop & SAVENAME) == 0)
+ if ((cnp->cn_flags & SAVENAME) == 0)
panic("direnter: missing name");
#endif
- dp = VTOI(ndp->ni_dvp);
- ump = VFSTOUFS(ndp->ni_dvp->v_mount);
+ dp = VTOI(dvp);
newdir.d_ino = ip->i_number;
- newdir.d_namlen = ndp->ni_namelen;
- bcopy(ndp->ni_ptr, newdir.d_name, (unsigned)ndp->ni_namelen + 1);
- newentrysize = DIRSIZ(&newdir);
- if (ndp->ni_ufs.ufs_count == 0) {
+ newdir.d_namlen = cnp->cn_namelen;
+ bcopy(cnp->cn_nameptr, newdir.d_name, (unsigned)cnp->cn_namelen + 1);
+ if (dvp->v_mount->mnt_maxsymlinklen > 0)
+ newdir.d_type = IFTODT(ip->i_mode);
+ else {
+ newdir.d_type = 0;
+# if (BYTE_ORDER == LITTLE_ENDIAN)
+ { u_char tmp = newdir.d_namlen;
+ newdir.d_namlen = newdir.d_type;
+ newdir.d_type = tmp; }
+# endif
+ }
+ newentrysize = DIRSIZ(FSFMT(dvp), &newdir);
+ if (dp->i_count == 0) {
/*
- * If ndp->ni_ufs.ufs_count is 0, then namei could find no
- * space in the directory. Here, ndp->ni_ufs.ufs_offset will
+ * If dp->i_count is 0, then namei could find no
+ * space in the directory. Here, dp->i_offset will
* be on a directory block boundary and we will write the
* new entry into a fresh block.
*/
- if (ndp->ni_ufs.ufs_offset & (DIRBLKSIZ - 1))
+ if (dp->i_offset & (DIRBLKSIZ - 1))
panic("wdir: newblk");
- auio.uio_offset = ndp->ni_ufs.ufs_offset;
+ auio.uio_offset = dp->i_offset;
newdir.d_reclen = DIRBLKSIZ;
auio.uio_resid = newentrysize;
aiov.iov_len = newentrysize;
auio.uio_rw = UIO_WRITE;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_procp = (struct proc *)0;
- error =
- (ump->um_write)(ndp->ni_dvp, &auio, IO_SYNC, ndp->ni_cred);
- if (DIRBLKSIZ > ump->um_mountp->mnt_stat.f_fsize)
+ error = VOP_WRITE(dvp, &auio, IO_SYNC, cnp->cn_cred);
+ if (DIRBLKSIZ >
+ VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize)
/* XXX should grow with balloc() */
panic("ufs_direnter: frag size");
else if (!error) {
}
/*
- * If ndp->ni_ufs.ufs_count is non-zero, then namei found space
- * for the new entry in the range ndp->ni_ufs.ufs_offset to
- * ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count in the directory.
+ * If dp->i_count is non-zero, then namei found space
+ * for the new entry in the range dp->i_offset to
+ * dp->i_offset + dp->i_count in the directory.
* To use this space, we may have to compact the entries located
* there, by copying them together towards the beginning of the
* block, leaving the free space in one usable chunk at the end.
*
* N.B. - THIS IS AN ARTIFACT OF 4.2 AND SHOULD NEVER HAPPEN.
*/
- if (ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count > dp->i_size)
- dp->i_size = ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count;
+ if (dp->i_offset + dp->i_count > dp->i_size)
+ dp->i_size = dp->i_offset + dp->i_count;
/*
* Get the block containing the space for the new directory entry.
*/
- if (error =
- (ump->um_blkatoff)(dp, ndp->ni_ufs.ufs_offset, &dirbuf, &bp))
+ if (error = VOP_BLKATOFF(dvp, (off_t)dp->i_offset, &dirbuf, &bp))
return (error);
/*
* Find space for the new entry. In the simple case, the entry at
* offset base will have the space. If it does not, then namei
- * arranged that compacting the region ndp->ni_ufs.ufs_offset to
- * ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count would yield the
+ * arranged that compacting the region dp->i_offset to
+ * dp->i_offset + dp->i_count would yield the
* space.
*/
ep = (struct direct *)dirbuf;
- dsize = DIRSIZ(ep);
+ dsize = DIRSIZ(FSFMT(dvp), ep);
spacefree = ep->d_reclen - dsize;
- for (loc = ep->d_reclen; loc < ndp->ni_ufs.ufs_count; ) {
+ for (loc = ep->d_reclen; loc < dp->i_count; ) {
nep = (struct direct *)(dirbuf + loc);
if (ep->d_ino) {
/* trim the existing slot */
/* overwrite; nothing there; header is ours */
spacefree += dsize;
}
- dsize = DIRSIZ(nep);
+ dsize = DIRSIZ(FSFMT(dvp), nep);
spacefree += nep->d_reclen - dsize;
loc += nep->d_reclen;
bcopy((caddr_t)nep, (caddr_t)ep, dsize);
ep = (struct direct *)((char *)ep + dsize);
}
bcopy((caddr_t)&newdir, (caddr_t)ep, (u_int)newentrysize);
- error = (ump->um_bwrite)(bp);
+ error = VOP_BWRITE(bp);
dp->i_flag |= IUPD|ICHG;
- if (!error && ndp->ni_ufs.ufs_endoff &&
- ndp->ni_ufs.ufs_endoff < dp->i_size)
- error = (ump->um_itrunc)(dp,
- (u_long)ndp->ni_ufs.ufs_endoff, IO_SYNC);
+ if (!error && dp->i_endoff && dp->i_endoff < dp->i_size)
+ error = VOP_TRUNCATE(dvp, (off_t)dp->i_endoff, IO_SYNC,
+ cnp->cn_cred, cnp->cn_proc);
return (error);
}
/*
* Remove a directory entry after a call to namei, using
* the parameters which it left in nameidata. The entry
- * ni_ufs.ufs_offset contains the offset into the directory of the
- * entry to be eliminated. The ni_ufs.ufs_count field contains the
+ * dp->i_offset contains the offset into the directory of the
+ * entry to be eliminated. The dp->i_count field contains the
* size of the previous record in the directory. If this
* is 0, the first entry is being deleted, so we need only
* zero the inode number to mark the entry as free. If the
* to the size of the previous entry.
*/
int
-ufs_dirremove(ndp)
- register struct nameidata *ndp;
+ufs_dirremove(dvp, cnp)
+ struct vnode *dvp;
+ struct componentname *cnp;
{
register struct inode *dp;
- struct ufsmount *ump;
struct direct *ep;
struct buf *bp;
int error;
- dp = VTOI(ndp->ni_dvp);
- ump = VFSTOUFS(ndp->ni_dvp->v_mount);
- if (ndp->ni_ufs.ufs_count == 0) {
+ dp = VTOI(dvp);
+ if (dp->i_count == 0) {
/*
* First entry in block: set d_ino to zero.
*/
- error = (ump->um_blkatoff)(dp,
- ndp->ni_ufs.ufs_offset, (char **)&ep, &bp);
- if (error)
+ if (error =
+ VOP_BLKATOFF(dvp, (off_t)dp->i_offset, (char **)&ep, &bp))
return (error);
ep->d_ino = 0;
- error = (ump->um_bwrite)(bp);
+ error = VOP_BWRITE(bp);
dp->i_flag |= IUPD|ICHG;
return (error);
}
/*
* Collapse new free space into previous entry.
*/
- if (error = (ump->um_blkatoff)(dp,
- ndp->ni_ufs.ufs_offset - ndp->ni_ufs.ufs_count, (char **)&ep, &bp))
+ if (error = VOP_BLKATOFF(dvp, (off_t)(dp->i_offset - dp->i_count),
+ (char **)&ep, &bp))
return (error);
- ep->d_reclen += ndp->ni_ufs.ufs_reclen;
- error = (ump->um_bwrite)(bp);
+ ep->d_reclen += dp->i_reclen;
+ error = VOP_BWRITE(bp);
dp->i_flag |= IUPD|ICHG;
return (error);
}
* set up by a call to namei.
*/
int
-ufs_dirrewrite(dp, ip, ndp)
+ufs_dirrewrite(dp, ip, cnp)
struct inode *dp, *ip;
- struct nameidata *ndp;
+ struct componentname *cnp;
{
struct buf *bp;
struct direct *ep;
- struct ufsmount *ump;
+ struct vnode *vdp = ITOV(dp);
int error;
- ump = VFSTOUFS(ndp->ni_dvp->v_mount);
- if (error =
- (ump->um_blkatoff)(dp, ndp->ni_ufs.ufs_offset, (char **)&ep, &bp))
+ if (error = VOP_BLKATOFF(vdp, (off_t)dp->i_offset, (char **)&ep, &bp))
return (error);
ep->d_ino = ip->i_number;
- error = (ump->um_bwrite)(bp);
+ if (vdp->v_mount->mnt_maxsymlinklen > 0)
+ ep->d_type = IFTODT(ip->i_mode);
+ error = VOP_BWRITE(bp);
dp->i_flag |= IUPD|ICHG;
return (error);
}
register off_t off;
struct dirtemplate dbuf;
register struct direct *dp = (struct direct *)&dbuf;
- int error, count;
+ int error, count, namlen;
#define MINDIRSIZ (sizeof (struct dirtemplate) / 2)
for (off = 0; off < ip->i_size; off += dp->d_reclen) {
if (dp->d_ino == 0)
continue;
/* accept only "." and ".." */
- if (dp->d_namlen > 2)
+# if (BYTE_ORDER == LITTLE_ENDIAN)
+ if (ITOV(ip)->v_mount->mnt_maxsymlinklen > 0)
+ namlen = dp->d_namlen;
+ else
+ namlen = dp->d_type;
+# else
+ namlen = dp->d_namlen;
+# endif
+ if (namlen > 2)
return (0);
if (dp->d_name[0] != '.')
return (0);
/*
- * At this point d_namlen must be 1 or 2.
+ * At this point namlen must be 1 or 2.
* 1 implies ".", 2 implies ".." if second
* char is also "."
*/
- if (dp->d_namlen == 1)
+ if (namlen == 1)
continue;
if (dp->d_name[1] == '.' && dp->d_ino == parentino)
continue;
struct ucred *cred;
{
struct dirtemplate dirbuf;
- struct inode *ip;
- struct ufsmount *ump;
- int error, rootino;
+ register struct inode *ip;
+ struct vnode *vp;
+ int error, rootino, namlen;
ip = target;
if (ip->i_number == source->i_number) {
error = EEXIST;
goto out;
}
-
- ump = VFSTOUFS(ITOV(ip)->v_mount);
rootino = ROOTINO;
-
error = 0;
if (ip->i_number == rootino)
goto out;
for (;;) {
- if ((ip->i_mode&IFMT) != IFDIR) {
+ if ((ip->i_mode & IFMT) != IFDIR) {
error = ENOTDIR;
break;
}
- error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)&dirbuf,
+ vp = ITOV(ip);
+ error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
IO_NODELOCKED, cred, (int *)0, (struct proc *)0);
if (error != 0)
break;
- if (dirbuf.dotdot_namlen != 2 ||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
+ if (vp->v_mount->mnt_maxsymlinklen > 0)
+ namlen = dirbuf.dotdot_namlen;
+ else
+ namlen = dirbuf.dotdot_type;
+# else
+ namlen = dirbuf.dotdot_namlen;
+# endif
+ if (namlen != 2 ||
dirbuf.dotdot_name[0] != '.' ||
dirbuf.dotdot_name[1] != '.') {
error = ENOTDIR;
if (dirbuf.dotdot_ino == rootino)
break;
ufs_iput(ip);
- if (error = (ump->um_iget)(ip, dirbuf.dotdot_ino, &ip))
+ if (error = VFS_VGET(vp->v_mount, dirbuf.dotdot_ino, &vp))
break;
+ ip = VTOI(vp);
}
out: