hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: Remove the macro XFS_BUF_TARGET 

Remove the definition and usages of the macro XFS_BUF_TARGET

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Chandra Seetharaman 2011-07-22 23:40:40 +00:00 committed by Alex Elder
parent e38c9b87e5
commit 49074c069c
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/xfs/linux-2.6/xfs_buf.h
View File

@ -292,7 +292,6 @@ static inline int xfs_buf_ispinned(struct xfs_buf *bp)
#define XFS_BUF_FINISH_IOWAIT(bp) complete(&bp->b_iowait); #define XFS_BUF_FINISH_IOWAIT(bp) complete(&bp->b_iowait);
#define XFS_BUF_TARGET(bp) ((bp)->b_target)
#define XFS_BUFTARG_NAME(target) xfs_buf_target_name(target) #define XFS_BUFTARG_NAME(target) xfs_buf_target_name(target)
static inline void xfs_buf_relse(xfs_buf_t *bp) static inline void xfs_buf_relse(xfs_buf_t *bp)

6
fs/xfs/xfs_buf_item.c
View File

@ -971,14 +971,14 @@ xfs_buf_iodone_callbacks(
goto do_callbacks; goto do_callbacks;
} }
if (XFS_BUF_TARGET(bp) != lasttarg || if (bp->b_target != lasttarg ||
time_after(jiffies, (lasttime + 5*HZ))) { time_after(jiffies, (lasttime + 5*HZ))) {
lasttime = jiffies; lasttime = jiffies;
xfs_alert(mp, "Device %s: metadata write error block 0x%llx", xfs_alert(mp, "Device %s: metadata write error block 0x%llx",
XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)), XFS_BUFTARG_NAME(bp->b_target),
(__uint64_t)XFS_BUF_ADDR(bp)); (__uint64_t)XFS_BUF_ADDR(bp));
} }
lasttarg = XFS_BUF_TARGET(bp); lasttarg = bp->b_target;
/* /*
* If the write was asynchronous then no one will be looking for the * If the write was asynchronous then no one will be looking for the

2
fs/xfs/xfs_mount.c
View File

@ -1615,7 +1615,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)
XFS_BUF_UNDELAYWRITE(sbp); XFS_BUF_UNDELAYWRITE(sbp);
XFS_BUF_WRITE(sbp); XFS_BUF_WRITE(sbp);
XFS_BUF_UNASYNC(sbp); XFS_BUF_UNASYNC(sbp);
ASSERT(XFS_BUF_TARGET(sbp) == mp->m_ddev_targp); ASSERT(sbp->b_target == mp->m_ddev_targp);
xfsbdstrat(mp, sbp); xfsbdstrat(mp, sbp);
error = xfs_buf_iowait(sbp); error = xfs_buf_iowait(sbp);
if (error) if (error)

2
fs/xfs/xfs_rw.c
View File

@ -104,7 +104,7 @@ xfs_ioerror_alert(
xfs_alert(mp, xfs_alert(mp,
"I/O error occurred: meta-data dev %s block 0x%llx" "I/O error occurred: meta-data dev %s block 0x%llx"
" (\"%s\") error %d buf count %zd", " (\"%s\") error %d buf count %zd",
XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)), XFS_BUFTARG_NAME(bp->b_target),
(__uint64_t)blkno, func, (__uint64_t)blkno, func,
bp->b_error, XFS_BUF_COUNT(bp)); bp->b_error, XFS_BUF_COUNT(bp));
} }

2
fs/xfs/xfs_trans_buf.c
View File

@ -54,7 +54,7 @@ xfs_trans_buf_item_match(
list_for_each_entry(lidp, &tp->t_items, lid_trans) { list_for_each_entry(lidp, &tp->t_items, lid_trans) {
blip = (struct xfs_buf_log_item *)lidp->lid_item; blip = (struct xfs_buf_log_item *)lidp->lid_item;
if (blip->bli_item.li_type == XFS_LI_BUF && if (blip->bli_item.li_type == XFS_LI_BUF &&
XFS_BUF_TARGET(blip->bli_buf) == target && blip->bli_buf->b_target == target &&
XFS_BUF_ADDR(blip->bli_buf) == blkno && XFS_BUF_ADDR(blip->bli_buf) == blkno &&
XFS_BUF_COUNT(blip->bli_buf) == len) XFS_BUF_COUNT(blip->bli_buf) == len)
return blip->bli_buf; return blip->bli_buf;