patch-pre2.0.6 linux/fs/affs/namei.c

• Lines: 77
• Date: Sun May 19 15:22:20 1996
• Orig file: pre2.0.5/linux/fs/affs/namei.c
• Orig date: Fri May 17 15:32:17 1996

diff -u --recursive --new-file pre2.0.5/linux/fs/affs/namei.c linux/fs/affs/namei.c
@@ -1,7 +1,7 @@
 /*
  *  linux/fs/affs/namei.c
  *
- *  (c) 1996  Hans-Joachim Widmaier - rewritten
+ *  (c) 1996  Hans-Joachim Widmaier - Rewritten
  *
  *  (C) 1993  Ray Burr - Modified for Amiga FFS filesystem.
  *
@@ -10,12 +10,12 @@
 
 #include <linux/sched.h>
 #include <linux/affs_fs.h>
-#include <linux/amigaffs.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/locks.h>
+#include <linux/amigaffs.h>
 #include <asm/segment.h>
 
 #include <linux/errno.h>
@@ -100,7 +100,7 @@
 {
 	struct buffer_head *bh;
 	int	 intl;
-	ULONG	 key;
+	int	 key;
 
 	pr_debug("AFFS: find_entry(%.*s)=\n",namelen,name);
 
@@ -137,7 +137,6 @@
 			break;
 		key = htonl(FILE_END(bh->b_data,dir)->hash_chain);
 	}
-	pr_debug("%lu\n",key);
 	*ino = key;
 	return bh;
 }
@@ -379,7 +378,6 @@
 	char			 c, lc;
 
 	pr_debug("AFFS: symlink(%lu,\"%.*s\" -> \"%s\")\n",dir->i_ino,len,name,symname);
-	printk("AFFS: symlink(%lu,\"%.*s\" -> \"%s\")\n",dir->i_ino,len,name,symname);
 	
 	maxlen = 4 * AFFS_I2HSIZE(dir) - 1;
 	inode  = affs_new_inode(dir);
@@ -548,7 +546,7 @@
 	int			 retval;
 
 	pr_debug("AFFS: rename(old=%lu,\"%*s\" to new=%lu,\"%*s\")\n",old_dir->i_ino,old_len,old_name,
-		new_dir->i_ino,new_len,new_name);
+		 new_dir->i_ino,new_len,new_name);
 	
 	if (new_len > 30)
 		new_len = 30;
@@ -607,7 +605,7 @@
 		if (affs_parent_ino(old_inode) != old_dir->i_ino)
 			goto end_rename;
 	}
-	/* Unlink destination if existant */
+	/* Unlink destination if existent */
 	if (new_inode) {
 		if ((retval = affs_fix_hash_pred(new_dir,affs_hash_name(new_name,new_len,
 		                                 AFFS_I2FSTYPE(new_dir),AFFS_I2HSIZE(new_dir)) + 6,
@@ -652,8 +650,8 @@
 int
 affs_fixup(struct buffer_head *bh, struct inode *inode)
 {
-	ULONG			 key, link_key;
-	LONG			 type;
+	int			 key, link_key;
+	int			 type;
 	struct buffer_head	*nbh;
 	struct inode		*ofinode;