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

 - (JFS) removes ->dev from struct jfs_log - it's duplicated by
   ->bdev.  Old users of ->dev updated.

fs/jfs/jfs_logmgr.c

@@ -1073,7 +1073,6 @@ int lmLogOpen(struct super_block *sb, log_t ** logptr)
 
 	log->sb = sb;		/* This should be a list */
 	log->flag = JFS_INLINELOG;
-	log->dev = sb->s_dev;
 	log->base = addressPXD(&JFS_SBI(sb)->logpxd);
 	log->size = lengthPXD(&JFS_SBI(sb)->logpxd) >>
 	    (L2LOGPSIZE - sb->s_blocksize_bits);
@@ -1104,7 +1103,6 @@ int lmLogOpen(struct super_block *sb, log_t ** logptr)
 	}
 
 	log->sb = sb;		/* This should be a list */
-	log->dev = JFS_SBI(sb)->logdev;
 	log->bdev = bdev;
 	
 	/*
@@ -1313,7 +1311,7 @@ static int lmLogInit(log_t * log)
 	logsuper->state = cpu_to_le32(LOGMOUNT);
 	log->serial = le32_to_cpu(logsuper->serial) + 1;
 	logsuper->serial = cpu_to_le32(log->serial);
-	logsuper->device = cpu_to_le32(kdev_t_to_nr(log->dev));
+	logsuper->device = cpu_to_le32(log->bdev->bd_dev);
 	lbmDirectWrite(log, bpsuper, lbmWRITE | lbmRELEASE | lbmSYNC);
 	if ((rc = lbmIOWait(bpsuper, lbmFREE)))
 		goto errout30;
@@ -1775,7 +1773,7 @@ static int lbmRead(log_t * log, int pn, lbuf_t ** bpp)
 	bio = bio_alloc(GFP_NOFS, 1);
 
 	bio->bi_sector = bp->l_blkno << (log->l2bsize - 9);
-	bio->bi_dev = log->dev;
+	bio->bi_dev = to_kdev_t(log->bdev->bd_dev);
 	bio->bi_io_vec[0].bv_page = virt_to_page(bp->l_ldata);
 	bio->bi_io_vec[0].bv_len = LOGPSIZE;
 	bio->bi_io_vec[0].bv_offset = 0;
@@ -1917,7 +1915,7 @@ void lbmStartIO(lbuf_t * bp)
 
 	bio = bio_alloc(GFP_NOFS, 1);
 	bio->bi_sector = bp->l_blkno << (log->l2bsize - 9);
-	bio->bi_dev = log->dev;
+	bio->bi_dev = to_kdev_t(log->bdev->bd_dev);
 	bio->bi_io_vec[0].bv_page = virt_to_page(bp->l_ldata);
 	bio->bi_io_vec[0].bv_len = LOGPSIZE;
 	bio->bi_io_vec[0].bv_offset = 0;

fs/jfs/jfs_logmgr.h

@@ -366,7 +366,6 @@ typedef struct jfs_log {
 				 *    need to be a list if we share
 				 *    the log between fs's
 				 */
-	kdev_t dev;		/* 4: log lv number */
 	struct block_device *bdev; /* 4: log lv pointer */
 	s32 serial;		/* 4: log mount serial number */
 

fs/jfs/jfs_mount.c

@@ -444,7 +444,7 @@ int updateSuper(struct super_block *sb, uint state)
 	if (state == FM_MOUNT) {
 		/* record log's dev_t and mount serial number */
 		j_sb->s_logdev =
-			cpu_to_le32(kdev_t_to_nr(JFS_SBI(sb)->log->dev));
+			cpu_to_le32(JFS_SBI(sb)->log->bdev->bd_dev);
 		j_sb->s_logserial = cpu_to_le32(JFS_SBI(sb)->log->serial);
 		/* record our own device number in case the location
 		 * changes after a reboot