[XFS] get rid of some more dev_t abuse

SGI Modid: 2.5.x-xfs:slinx:134013a

fs/xfs/xfs_buf.h

@@ -182,6 +182,7 @@ extern inline xfs_caddr_t xfs_buf_offset(page_buf_t *bp, off_t offset)
 #define XFS_BUF_SET_TARGET(bp, target)	\
 	(bp)->pb_target = (target)
 
+#define XFS_BUF_TARGET(bp)	((bp)->pb_target)
 #define XFS_BUF_TARGET_DEV(bp)	((bp)->pb_target->pbr_dev)
 #define XFS_BUF_SET_VTYPE_REF(bp, type, ref)
 #define XFS_BUF_SET_VTYPE(bp, type)

fs/xfs/xfs_buf_item.c

@@ -1005,7 +1005,7 @@ xfs_buf_iodone_callbacks(
 		 */
 		mp = lip->li_mountp;
 		if (XFS_FORCED_SHUTDOWN(mp)) {
-			ASSERT(XFS_BUF_TARGET_DEV(bp) == mp->m_dev);
+			ASSERT(XFS_BUF_TARGET(bp) == mp->m_ddev_targp);
 			XFS_BUF_SUPER_STALE(bp);
 			xfs_buftrace("BUF_IODONE_CB", bp);
 			xfs_buf_do_callbacks(bp, lip);
@@ -1102,7 +1102,7 @@ xfs_buf_error_relse(
 
 	lip = XFS_BUF_FSPRIVATE(bp, xfs_log_item_t *);
 	mp = (xfs_mount_t *)lip->li_mountp;
-	ASSERT(XFS_BUF_TARGET_DEV(bp) == mp->m_dev);
+	ASSERT(XFS_BUF_TARGET(bp) == mp->m_ddev_targp);
 
 	XFS_BUF_STALE(bp);
 	XFS_BUF_DONE(bp);

fs/xfs/xfs_mount.c

@@ -1199,7 +1199,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)
 		XFS_BUF_UNDELAYWRITE(sbp);
 		XFS_BUF_WRITE(sbp);
 		XFS_BUF_UNASYNC(sbp);
-		ASSERT(XFS_BUF_TARGET_DEV(sbp) == mp->m_dev);
+		ASSERT(XFS_BUF_TARGET(sbp) == mp->m_ddev_targp);
 		xfsbdstrat(mp, sbp);
 		/* Nevermind errors we might get here. */
 		error = xfs_iowait(sbp);

fs/xfs/xfs_trans_buf.c

@@ -1013,7 +1013,7 @@ xfs_trans_buf_item_match(
 			}
 
 			bp = blip->bli_buf;
-			if ((XFS_BUF_TARGET_DEV(bp) == target->pbr_dev) &&
+			if ((XFS_BUF_TARGET(bp) == target) &&
 			    (XFS_BUF_ADDR(bp) == blkno) &&
 			    (XFS_BUF_COUNT(bp) == len)) {
 				/*
@@ -1070,7 +1070,7 @@ xfs_trans_buf_item_match_all(
 			}
 
 			bp = blip->bli_buf;
-			if ((XFS_BUF_TARGET_DEV(bp) == target->pbr_dev) &&
+			if ((XFS_BUF_TARGET(bp) == target) &&
 			    (XFS_BUF_ADDR(bp) == blkno) &&
 			    (XFS_BUF_COUNT(bp) == len)) {
 				/*