[PATCH] (14/15) big struct block_device * push (first series)

 - bdevname() switched to struct block_device *.  Old variant (taking
   kdev_t) renamed to __bdevname() (very few callers remain).  This
   allow to drop ->b_dev conveniently - it's duplicated by ->b_bdev
   and most of remaining users were bdevname(bh->b_dev) in various
   places.

13 files changed, 23 insertions, 36 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index f7460a3283b9..46554de6d9e5 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -117,7 +117,6 @@ static int blkdev_get_block(struct inode * inode, sector_t iblock, struct buffer
 	if (iblock >= max_block(inode->i_rdev))
 		return -EIO;
 
-	bh->b_dev = inode->i_rdev;
 	bh->b_bdev = inode->i_bdev;
 	bh->b_blocknr = iblock;
 	bh->b_state |= 1UL << BH_Mapped;
@@ -564,7 +563,7 @@ int check_disk_change(kdev_t dev)
 		return 0;
 
 	printk(KERN_DEBUG "VFS: Disk change detected on device %s\n",
-		bdevname(dev));
+		__bdevname(dev));
 
 	if (invalidate_device(dev, 0))
 		printk("VFS: busy inodes on changed media.\n");
@@ -768,7 +767,7 @@ struct file_operations def_blk_fops = {
 	ioctl:		blkdev_ioctl,
 };
 
-const char * bdevname(kdev_t dev)
+const char *__bdevname(kdev_t dev)
 {
 	static char buffer[32];
 	const char * name = blkdevs[major(dev)].name;
diff --git a/fs/buffer.c b/fs/buffer.c
index d289344fcd63..b0f99601d684 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -507,7 +507,7 @@ out:
 
 static inline void __insert_into_hash_list(struct buffer_head *bh)
 {
-	struct buffer_head **head = &hash(bh->b_dev, bh->b_blocknr);
+	struct buffer_head **head = &hash(to_kdev_t(bh->b_bdev->bd_dev), bh->b_blocknr);
 	struct buffer_head *next = *head;
 
 	*head = bh;
@@ -1142,7 +1142,6 @@ static void __put_unused_buffer_head(struct buffer_head * bh)
 	if (nr_unused_buffer_heads >= MAX_UNUSED_BUFFERS) {
 		kmem_cache_free(bh_cachep, bh);
 	} else {
-		bh->b_dev = B_FREE;
 		bh->b_bdev = NULL;
 		bh->b_blocknr = -1;
 		bh->b_this_page = NULL;
@@ -1246,7 +1245,6 @@ try_again:
 		if (!bh)
 			goto no_grow;
 
-		bh->b_dev = NODEV;
 		bh->b_bdev = NULL;
 		bh->b_this_page = head;
 		head = bh;
@@ -2092,7 +2090,6 @@ int generic_direct_IO(int rw, struct inode * inode, struct kiobuf * iobuf, unsig
 		struct buffer_head bh;
 
 		bh.b_state = 0;
-		bh.b_dev = inode->i_dev;
 		bh.b_size = blocksize;
 
 		retval = get_block(inode, blocknr, &bh, rw & 1);
@@ -2210,7 +2207,6 @@ int brw_page(int rw, struct page *page, struct block_device *bdev, sector_t b[],
 		lock_buffer(bh);
 		bh->b_blocknr = *(b++);
 		bh->b_bdev = bdev;
-		bh->b_dev = to_kdev_t(bdev->bd_dev);
 		set_bit(BH_Mapped, &bh->b_state);
 		set_buffer_async_io(bh);
 		bh = bh->b_this_page;
@@ -2325,7 +2321,6 @@ static void hash_page_buffers(struct page *page, struct block_device *bdev, int
 		if (!(bh->b_state & (1 << BH_Mapped))) {
 			init_buffer(bh, NULL, NULL);
 			bh->b_bdev = bdev;
-			bh->b_dev = to_kdev_t(bdev->bd_dev);
 			bh->b_blocknr = block;
 			bh->b_state = uptodate;
 		}
@@ -2462,9 +2457,6 @@ cleaned_buffers_try_again:
 	do {
 		struct buffer_head * p = tmp;
 		tmp = tmp->b_this_page;
-
-		if (kdev_same(p->b_dev, B_FREE)) BUG();
-
 		remove_inode_queue(p);
 		__remove_from_queues(p);
 		__put_unused_buffer_head(p);
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index a82c4e827cd3..4f742c2affa4 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -58,7 +58,7 @@ static void make_rdonly(struct block_device *bdev, int *no_write)
 {
 	if (bdev) {
 		printk(KERN_WARNING "Turning device %s read-only\n", 
-		       bdevname(to_kdev_t(bdev->bd_dev)));
+		       bdevname(bdev));
 		*no_write = 0xdead0000 + bdev->bd_dev;
 	}
 }
@@ -351,7 +351,7 @@ static struct block_device *ext3_blkdev_get(kdev_t dev)
 
 fail:
 	printk(KERN_ERR "EXT3: failed to open journal device %s: %d\n",
-			bdevname(dev), err);
+			__bdevname(dev), err);
 	return NULL;
 }
 
@@ -764,7 +764,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,
 				sb->s_id);
 	if (EXT3_SB(sb)->s_journal->j_inode == NULL) {
 		printk("external journal on %s\n",
-		    bdevname(to_kdev_t(EXT3_SB(sb)->s_journal->j_dev->bd_dev)));
+		    bdevname(EXT3_SB(sb)->s_journal->j_dev));
 	} else {
 		printk("internal journal\n");
 	}
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index e0ea5fc1de80..a71b6611d7eb 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -476,7 +476,6 @@ int journal_write_metadata_buffer(transaction_t *transaction,
 	new_jh->b_transaction = NULL;
 	new_bh->b_size = jh2bh(jh_in)->b_size;
 	new_bh->b_bdev = transaction->t_journal->j_dev;
-	new_bh->b_dev = to_kdev_t(transaction->t_journal->j_dev->bd_dev);
 	new_bh->b_blocknr = blocknr;
 	new_bh->b_state |= (1 << BH_Mapped) | (1 << BH_Dirty);
 
@@ -641,7 +640,7 @@ int journal_bmap(journal_t *journal, unsigned long blocknr,
 				": journal block not found "
 				"at offset %lu on %s\n",
 				blocknr,
-				bdevname(to_kdev_t(journal->j_dev->bd_dev)));
+				bdevname(journal->j_dev));
 			err = -EIO;
 			__journal_abort_soft(journal, err);
 		}
@@ -1366,7 +1365,7 @@ const char * journal_dev_name(journal_t *journal)
 	else
 		bdev = journal->j_dev;
 
-	return bdevname(to_kdev_t(bdev->bd_dev));
+	return bdevname(bdev);
 }
 
 /*
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c
index fd0f1f862153..94304db6953f 100644
--- a/fs/partitions/acorn.c
+++ b/fs/partitions/acorn.c
@@ -261,7 +261,7 @@ adfspart_check_ADFS(struct gendisk *hd, struct block_device *bdev,
 	/*
 	 * Work out start of non-adfs partition.
 	 */
-	nr_sects = hd->part[minor(to_kdev_t(bdev->bd_dev))].nr_sects - start_sect;
+	nr_sects = (bdev->bd_inode->i_size >> 9) - start_sect;
 
 	if (start_sect) {
 		first_sector += start_sect;
diff --git a/fs/partitions/amiga.c b/fs/partitions/amiga.c
index 3ecf9c4f88b4..bf70413faa9f 100644
--- a/fs/partitions/amiga.c
+++ b/fs/partitions/amiga.c
@@ -39,7 +39,6 @@ amiga_partition(struct gendisk *hd, struct block_device *bdev,
 	struct RigidDiskBlock *rdb;
 	struct PartitionBlock *pb;
 	int start_sect, nr_sects, blk, part, res = 0;
-	kdev_t dev = to_kdev_t(bdev->bd_dev);
 
 	for (blk = 0; ; blk++, put_dev_sector(sect)) {
 		if (blk == RDB_ALLOCATION_LIMIT)
@@ -48,7 +47,7 @@ amiga_partition(struct gendisk *hd, struct block_device *bdev,
 		if (!data) {
 			if (warn_no_part)
 				printk("Dev %s: unable to read RDB block %d\n",
-				       bdevname(dev), blk);
+				       bdevname(bdev), blk);
 			goto rdb_done;
 		}
 		if (*(u32 *)data != cpu_to_be32(IDNAME_RIGIDDISK))
@@ -69,7 +68,7 @@ amiga_partition(struct gendisk *hd, struct block_device *bdev,
 		}
 
 		printk("Dev %s: RDB in block %d has bad checksum\n",
-			       bdevname(dev),blk);
+			       bdevname(bdev),blk);
 	}
 
 	printk(" RDSK");
@@ -80,7 +79,7 @@ amiga_partition(struct gendisk *hd, struct block_device *bdev,
 		if (!data) {
 			if (warn_no_part)
 				printk("Dev %s: unable to read partition block %d\n",
-				       bdevname(dev),blk);
+				       bdevname(bdev),blk);
 			goto rdb_done;
 		}
 		pb  = (struct PartitionBlock *)data;
diff --git a/fs/partitions/sgi.c b/fs/partitions/sgi.c
index ea74ebb4b57b..5051e3d28ab4 100644
--- a/fs/partitions/sgi.c
+++ b/fs/partitions/sgi.c
@@ -22,7 +22,6 @@ int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 	int i, csum, magic;
 	unsigned int *ui, start, blocks, cs;
 	Sector sect;
-	kdev_t dev = to_kdev_t(bdev->bd_dev);
 	struct sgi_disklabel {
 		int magic_mushroom;         /* Big fat spliff... */
 		short root_part_num;        /* Root partition number */
@@ -51,7 +50,7 @@ int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 	magic = label->magic_mushroom;
 	if(be32_to_cpu(magic) != SGI_LABEL_MAGIC) {
 		/*printk("Dev %s SGI disklabel: bad magic %08x\n",
-		       bdevname(dev), magic);*/
+		       bdevname(bdev), magic);*/
 		put_dev_sector(sect);
 		return 0;
 	}
@@ -62,7 +61,7 @@ int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 	}
 	if(csum) {
 		printk(KERN_WARNING "Dev %s SGI disklabel: csum bad, label corrupted\n",
-		       bdevname(dev));
+		       bdevname(bdev));
 		put_dev_sector(sect);
 		return 0;
 	}
diff --git a/fs/partitions/sun.c b/fs/partitions/sun.c
index bee5abb6537b..a19f89dfd2e1 100644
--- a/fs/partitions/sun.c
+++ b/fs/partitions/sun.c
@@ -24,7 +24,6 @@ int sun_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 	int i, csum;
 	unsigned short *ush;
 	Sector sect;
-	kdev_t dev = to_kdev_t(bdev->bd_dev);
 	struct sun_disklabel {
 		unsigned char info[128];   /* Informative text string */
 		unsigned char spare[292];  /* Boot information etc. */
@@ -55,7 +54,7 @@ int sun_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 	p = label->partitions;
 	if (be16_to_cpu(label->magic) != SUN_LABEL_MAGIC) {
 /*		printk(KERN_INFO "Dev %s Sun disklabel: bad magic %04x\n",
-		       bdevname(dev), be16_to_cpu(label->magic)); */
+		       bdevname(bdev), be16_to_cpu(label->magic)); */
 		put_dev_sector(sect);
 		return 0;
 	}
@@ -65,7 +64,7 @@ int sun_partition(struct gendisk *hd, struct block_device *bdev, unsigned long f
 		csum ^= *ush--;
 	if(csum) {
 		printk("Dev %s Sun disklabel: Csum bad, label corrupted\n",
-		       bdevname(dev));
+		       bdevname(bdev));
 		put_dev_sector(sect);
 		return 0;
 	}
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 8b15506fc6bd..d32d0df19725 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -893,7 +893,7 @@ static int flush_older_journal_lists(struct super_block *p_s_sb, struct reiserfs
 static void reiserfs_end_buffer_io_sync(struct buffer_head *bh, int uptodate) {
     if (buffer_journaled(bh)) {
         reiserfs_warning("clm-2084: pinned buffer %lu:%s sent to disk\n",
-	                 bh->b_blocknr, kdevname(bh->b_dev)) ;
+	                 bh->b_blocknr, bdevname(bh->b_bdev)) ;
     }
     mark_buffer_uptodate(bh, uptodate) ;
     unlock_buffer(bh) ;
@@ -1666,7 +1666,7 @@ static int journal_read(struct super_block *p_s_sb) {
 
   cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) ;
   printk("reiserfs: checking transaction log (%s) for (%s)\n",
-	 bdevname(SB_JOURNAL_DEV(p_s_sb)), p_s_sb->s_id) ;
+	 __bdevname(SB_JOURNAL_DEV(p_s_sb)), p_s_sb->s_id) ;
   start = CURRENT_TIME ;
 
   /* step 1, read in the journal header block.  Check the transaction it says 
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 124776d1fdc9..8afd8ebeae47 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -139,7 +139,7 @@ static void sprintf_block_head (char * buf, struct buffer_head * bh)
 static void sprintf_buffer_head (char * buf, struct buffer_head * bh) 
 {
   sprintf (buf, "dev %s, size %d, blocknr %ld, count %d, list %d, state 0x%lx, page %p, (%s, %s, %s)",
-	   kdevname (bh->b_dev), bh->b_size, bh->b_blocknr, atomic_read (&(bh->b_count)), bh->b_list,
+	   bdevname (bh->b_bdev), bh->b_size, bh->b_blocknr, atomic_read (&(bh->b_count)), bh->b_list,
 	   bh->b_state, bh->b_page,
 	   buffer_uptodate (bh) ? "UPTODATE" : "!UPTODATE",
 	   buffer_dirty (bh) ? "DIRTY" : "CLEAN",
@@ -508,7 +508,7 @@ static int print_super_block (struct buffer_head * bh)
     }
 
     printk ("%s\'s super block in block %ld\n======================\n",
-            kdevname (bh->b_dev), bh->b_blocknr);
+            bdevname (bh->b_bdev), bh->b_blocknr);
     printk ("Reiserfs version %s\n", version );
     printk ("Block count %u\n", sb_block_count(rs));
     printk ("Blocksize %d\n", sb_blocksize(rs));
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 79f7b5e2be57..359f66b1351b 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -501,7 +501,7 @@ int reiserfs_journal_in_proc( char *buffer, char **start, off_t offset,
 			"prepare_retry: \t%12lu\n",
 
                         DJP( jp_journal_1st_block ),
-                        DJP( jp_journal_dev ) == 0 ? "none" : bdevname(to_kdev_t(DJP( jp_journal_dev ))),
+                        DJP( jp_journal_dev ) == 0 ? "none" : __bdevname(to_kdev_t(DJP( jp_journal_dev ))),
                         DJP( jp_journal_dev ),
                         DJP( jp_journal_size ),
                         DJP( jp_journal_trans_max ),
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 85c7c03db9fa..e5271b25ae23 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -395,7 +395,7 @@ static  inline  int key_in_buffer (
 	  p_s_chk_path->path_length > MAX_HEIGHT,
 	  "PAP-5050: pointer to the key(%p) is NULL or illegal path length(%d)",
 	  p_s_key, p_s_chk_path->path_length);
-  RFALSE( kdev_same(PATH_PLAST_BUFFER(p_s_chk_path)->b_dev, NODEV),
+  RFALSE( !PATH_PLAST_BUFFER(p_s_chk_path)->b_bdev,
 	  "PAP-5060: device must not be NODEV");
 
   if ( COMP_KEYS(get_lkey(p_s_chk_path, p_s_sb), p_s_key) == 1 )
diff --git a/fs/super.c b/fs/super.c
index 8f84b182f199..b0a51d09e0ec 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -515,7 +515,7 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type,
 		blkdev_put(bdev, BDEV_FS);
 	} else {
 		s->s_flags = flags;
-		strncpy(s->s_id, bdevname(dev), sizeof(s->s_id));
+		strncpy(s->s_id, bdevname(bdev), sizeof(s->s_id));
 		s->s_old_blocksize = block_size(dev);
 		sb_set_blocksize(s, s->s_old_blocksize);
 		error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);