patch-1.3.28 linux/fs/xiafs/bitmap.c

• Lines: 36
• Date: Mon Sep 18 08:54:11 1995
• Orig file: v1.3.27/linux/fs/xiafs/bitmap.c
• Orig date: Mon Jan 23 10:38:30 1995

diff -u --recursive --new-file v1.3.27/linux/fs/xiafs/bitmap.c linux/fs/xiafs/bitmap.c
@@ -239,9 +239,9 @@
 	return;
     offset = bit & (XIAFS_BITS_PER_Z(sb) -1);
     if (!clear_bit(offset, bh->b_data))
-        printk("XIA-FS: dev %04x"
+        printk("XIA-FS: dev %s"
 	       " block bit %u (0x%x) already cleared (%s %d)\n",
-	       sb->s_dev, bit, bit, WHERE_ERR);
+	       kdevname(sb->s_dev), bit, bit, WHERE_ERR);
     mark_buffer_dirty(bh, 1);
     xiafs_unlock_super(sb, sb->u.xiafs_sb.s_zmap_cached);
 }
@@ -287,8 +287,9 @@
 
     if (!inode)
         return;
-    if (!inode->i_dev || inode->i_count!=1 || inode->i_nlink || !inode->i_sb ||
-	inode->i_ino < 3 || inode->i_ino > inode->i_sb->u.xiafs_sb.s_ninodes) {
+    if (!inode->i_dev || inode->i_count!=1
+	|| inode->i_nlink || !inode->i_sb || inode->i_ino < 3
+	|| inode->i_ino > inode->i_sb->u.xiafs_sb.s_ninodes) {
         printk("XIA-FS: bad inode (%s %d)\n", WHERE_ERR);
 	return;
     }
@@ -299,9 +300,9 @@
 	return;
     clear_inode(inode);
     if (!clear_bit(ino & (XIAFS_BITS_PER_Z(sb)-1), bh->b_data))
-        printk("XIA-FS: dev %04x"
+        printk("XIA-FS: dev %s"
 	       "inode bit %ld (0x%lx) already cleared (%s %d)\n",
-	       inode->i_dev, ino, ino, WHERE_ERR);
+	       kdevname(inode->i_dev), ino, ino, WHERE_ERR);
     mark_buffer_dirty(bh, 1);
     xiafs_unlock_super(sb, sb->u.xiafs_sb.s_imap_cached);
 }