patch-1.3.28 linux/fs/minix/namei.c

• Lines: 31
• Date: Mon Sep 18 08:54:11 1995
• Orig file: v1.3.27/linux/fs/minix/namei.c
• Orig date: Mon Jan 23 10:38:29 1995

diff -u --recursive --new-file v1.3.27/linux/fs/minix/namei.c linux/fs/minix/namei.c
@@ -286,7 +286,7 @@
 	else if (S_ISFIFO(inode->i_mode))
 		init_fifo(inode);
 	if (S_ISBLK(mode) || S_ISCHR(mode))
-		inode->i_rdev = rdev;
+		inode->i_rdev = to_kdev_t(rdev);
 	inode->i_dirt = 1;
 	error = minix_add_entry(dir, name, len, &bh, &de);
 	if (error) {
@@ -426,7 +426,8 @@
 	return 1;
 bad_dir:
 	brelse(bh);
-	printk("Bad directory on device %04x\n",inode->i_dev);
+	printk("Bad directory on device %s\n",
+	       kdevname(inode->i_dev));
 	return 1;
 }
 
@@ -521,8 +522,9 @@
 		goto end_unlink;
 	}
 	if (!inode->i_nlink) {
-		printk("Deleting nonexistent file (%04x:%lu), %d\n",
-			inode->i_dev,inode->i_ino,inode->i_nlink);
+		printk("Deleting nonexistent file (%s:%lu), %d\n",
+			kdevname(inode->i_dev),
+		       inode->i_ino, inode->i_nlink);
 		inode->i_nlink=1;
 	}
 	de->inode = 0;