patch-2.1.87 linux/fs/ufs/ufs_namei.c

• Lines: 220
• Date: Fri Feb 13 11:11:29 1998
• Orig file: v2.1.86/linux/fs/ufs/ufs_namei.c
• Orig date: Thu Dec 4 01:27:48 1997

diff -u --recursive --new-file v2.1.86/linux/fs/ufs/ufs_namei.c linux/fs/ufs/ufs_namei.c
@@ -9,6 +9,9 @@
  * Clean swab support by Francois-Rene Rideau <rideau@ens.fr> 19970406
  * Ported to 2.1.62 by Francois-Rene Rideau <rideau@ens.fr> 19971109
  *
+ * 4.4BSD (FreeBSD) support added on February 1st 1998 by
+ * Niels Kristian Bech Jensen <nkbj@image.dk> partially based
+ * on code by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>.
  */
 
 #include <linux/fs.h>
@@ -17,20 +20,21 @@
 #include "ufs_swab.h"
 
 /*
- * NOTE! unlike strncmp, ext2_match returns 1 for success, 0 for failure.
- * stolen from ext2fs
+ * NOTE1: unlike strncmp, ufs_match returns 1 for success, 0 for failure
+ * (stolen from ext2fs.)
+ * NOTE2: flags *is* used, though this is hidden by macros like NAMLEN.
  */
-static int ufs_match (int len, const char * const name, struct ufs_direct * d, __u32 bytesex)
+static int ufs_match (int len, const char * const name, struct ufs_direct * d, __u32 flags)
 {
 	if (!d || len > UFS_MAXNAMLEN) /* XXX - name space */
 		return 0;
 	/*
 	 * "" means "." ---> so paths like "/usr/lib//libc.a" work
 	 */
-	if (!len && (SWAB16(d->d_namlen) == 1) && (d->d_name[0] == '.') &&
+	if (!len && (NAMLEN(d) == 1) && (d->d_name[0] == '.') &&
   	   (d->d_name[1] == '\0'))
   		return 1;
-	if (len != SWAB16(d->d_namlen))
+	if (len != NAMLEN(d))
 		return 0;
 	return !memcmp(name, d->d_name, len);
 }
@@ -38,89 +42,88 @@
 int ufs_lookup (struct inode *dir, struct dentry *dentry)
 {
   /* XXX - this is all fucked up! */
-  /* XXX - and it's been broken since linux has this new dentry interface:
-   * allows reading of files, but screws the whole dcache, even outside
-   * of the ufs partition, so that umount'ing won't suffice to fix it --
-   * reboot needed
-   */
 	unsigned long int lfragno, fragno;
 	struct buffer_head * bh;
 	struct ufs_direct * d;
+	struct super_block * sb = dir->i_sb;
 	const char *name = dentry->d_name.name;
 	int len = dentry->d_name.len;
-	__u32 bytesex;
+	__u32 flags;
         struct inode *inode;
 
 	/* XXX - isn't that already done by the upper layer? */
         if (!dir || !S_ISDIR(dir->i_mode))
 		return -EBADF;
 
-	bytesex = dir->i_sb->u.ufs_sb.s_flags & UFS_BYTESEX;
+	flags = sb->u.ufs_sb.s_flags;
 
-	if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG)
+	if (flags & UFS_DEBUG)
 		printk("Passed name: %s\nPassed length: %d\n", name, len);
 
-
 	/* debugging hacks:
 	 * Touching /xyzzy in a filesystem toggles debugging messages.
 	 */
 	if ((len == 5) && !(memcmp(name, "xyzzy", len)) &&
 	    (dir->i_ino == UFS_ROOTINO)) {
-	        dir->i_sb->u.ufs_sb.s_flags ^= UFS_DEBUG;
+	        sb->u.ufs_sb.s_flags ^= UFS_DEBUG;
 	        printk("UFS debugging %s\n",
-	               (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) ?
+	               (sb->u.ufs_sb.s_flags & UFS_DEBUG) ?
 	               "on": "off");
 		goto not_found;
 	        /*return(-ENOENT);*/
 	}
 
 	/*
-	 * Touching /xyzzy.i in a filesystem toggles debugging for ufs_inode.c.
+	 * Touching /xyzzy.i in a filesystem toggles debugging for ufs_inode.c
 	 */
 	if ((len == 7) && !(memcmp(name, "xyzzy.i", len)) &&
 	    (dir->i_ino == UFS_ROOTINO)) {
-	        dir->i_sb->u.ufs_sb.s_flags ^= UFS_DEBUG_INODE;
+	        sb->u.ufs_sb.s_flags ^= UFS_DEBUG_INODE;
 	        printk("UFS inode debugging %s\n",
-	               (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG_INODE) ?
+	               (sb->u.ufs_sb.s_flags & UFS_DEBUG_INODE) ?
 	               "on": "off");
 		goto not_found;
 	        /*return(-ENOENT);*/
 	}
 
+	/*
+	 * Touching /xyzzy.n in a filesystem toggles debugging for ufs_namei.c
+	 */
 	if ((len == 7) && !(memcmp(name, "xyzzy.n", len)) &&
 	    (dir->i_ino == UFS_ROOTINO)) {
-	        dir->i_sb->u.ufs_sb.s_flags ^= UFS_DEBUG_NAMEI;
+	        sb->u.ufs_sb.s_flags ^= UFS_DEBUG_NAMEI;
 	        printk("UFS namei debugging %s\n",
-	               (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG_NAMEI) ?
+	               (sb->u.ufs_sb.s_flags & UFS_DEBUG_NAMEI) ?
 	               "on": "off");
 		goto not_found;
 	        /*return(-ENOENT);*/
 	}
 
+	/*
+	 * Touching /xyzzy.l in a filesystem toggles debugging for ufs_symlink.c
+	 */
 	if ((len == 7) && !(memcmp(name, "xyzzy.l", len)) &&
 	    (dir->i_ino == UFS_ROOTINO)) {
-	        dir->i_sb->u.ufs_sb.s_flags ^= UFS_DEBUG_LINKS;
+	        sb->u.ufs_sb.s_flags ^= UFS_DEBUG_LINKS;
 	        printk("UFS symlink debugging %s\n",
-	               (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG_LINKS) ?
+	               (sb->u.ufs_sb.s_flags & UFS_DEBUG_LINKS) ?
 	               "on": "off");
 		goto not_found;
 	        /*return(-ENOENT);*/
 	}
 
-
 	/* Now for the real thing */
 
-	if (dir->i_sb->u.ufs_sb.s_flags & (UFS_DEBUG|UFS_DEBUG_NAMEI)) {
+ 	if (flags & (UFS_DEBUG|UFS_DEBUG_NAMEI)) {
 	        printk("ufs_lookup: called for ino %lu  name %s\n",
 	               dir->i_ino, name);
 	}
 
-	/* XXX - do I want i_blocks in 512-blocks or 1024-blocks? */
-	for (lfragno = 0; lfragno < (dir->i_blocks)>>1; lfragno++) {
+ 	for (lfragno = 0; lfragno < dir->i_blocks; lfragno++) {
 	        fragno = ufs_bmap(dir, lfragno);
+ 		/* ufs_bmap() reads the block (frag) size in s_blocksize */
 	        /* XXX - ufs_bmap() call needs error checking */
-	        /* XXX - s_blocksize is actually the UFS frag size */
-	        if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) {
+ 	        if (flags & UFS_DEBUG) {
 	                printk("ufs_lookup: ino %lu lfragno %lu  fragno %lu\n",
 	                       dir->i_ino, lfragno, fragno);
 	        }
@@ -129,7 +132,7 @@
 			goto not_found;
 			/*return(-ENOENT);*/
 	        }
-	        bh = bread(dir->i_dev, fragno, dir->i_sb->s_blocksize);
+	        bh = bread(dir->i_dev, fragno, sb->s_blocksize);
 	        if (bh == NULL) {
 	                printk("ufs_lookup: bread failed: "
                                "ino %lu, lfragno %lu",
@@ -138,17 +141,17 @@
 	        }
 	        d = (struct ufs_direct *)(bh->b_data);
 	        while (((char *)d - bh->b_data + SWAB16(d->d_reclen)) <=
-	               dir->i_sb->s_blocksize) {
+	               sb->s_blocksize) {
 	                /* XXX - skip block if d_reclen or d_namlen is 0 */
-	                if ((d->d_reclen == 0) || (d->d_namlen == 0)) {
+	                if ((d->d_reclen == 0) || (NAMLEN(d) == 0)) {
 			/* no need to SWAB16(): test against 0 */
-	                        if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) {
+	                        if (flags & UFS_DEBUG) {
 	                                printk("ufs_lookup: skipped space in directory, ino %lu\n",
 	                                       dir->i_ino);
 	                        }
 	                        break;
 	                }
-	                if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) {
+	                if (flags & UFS_DEBUG) {
 	                        printk("lfragno 0x%lx  "
 					"direct d 0x%x  "
 					"d_ino %u  "
@@ -158,30 +161,31 @@
 				        (unsigned int)((unsigned long)d),
 					SWAB32(d->d_ino),
 					SWAB16(d->d_reclen),
-					SWAB16(d->d_namlen),d->d_name);
+					NAMLEN(d),d->d_name);
 	                }
-	                if ((SWAB16(d->d_namlen) == len) &&
+	                if ((NAMLEN(d) == len) &&
 	                    /* XXX - don't use strncmp() - see ext2fs */
-	                    (ufs_match(len, name, d, bytesex))) {
+	                    (ufs_match(len, name, d, flags))) {
 	                        /* We have a match */
 /* XXX - I only superficially understand how things work,
  * so use at your own risk... -- Fare'
  */
-				inode = iget(dir->i_sb, SWAB32(d->d_ino));
+				inode = iget(sb, SWAB32(d->d_ino));
 				brelse(bh);
 				if(!inode) { return -EACCES; }
                                 d_add(dentry,inode);
 	                        return(0);
 	                } else {
 	                        /* XXX - bounds checking */
-	                        if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) {
+	                        if (flags & UFS_DEBUG) {
 	                                printk("ufs_lookup: "
 						"wanted (%s,%d) got (%s,%d)\n",
 	                                       name, len,
-					       d->d_name, SWAB16(d->d_namlen));
+					       d->d_name, NAMLEN(d));
 	                        }
 	                }
-			d = (struct ufs_direct *)((char *)d + SWAB16(d->d_reclen));
+			d = (struct ufs_direct *)((char *)d +
+			     SWAB16(d->d_reclen));
 	        }
 	        brelse(bh);
 	}