Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e68ff9cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs 

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: replace xfs_buf_geterror() with bp->b_error
  xfs: Check the return value of xfs_buf_read() for NULL
  "xfs: fix error handling for synchronous writes" revisited
  xfs: set cursor in xfs_ail_splice() even when AIL was empty
  xfs: Remove the macro XFS_BUFTARG_NAME
  xfs: Remove the macro XFS_BUF_TARGET
  xfs: Remove the macro XFS_BUF_SET_TARGET
  Replace the macro XFS_BUF_ISPINNED with helper xfs_buf_ispinned
  xfs: Remove the macro XFS_BUF_SET_PTR
  xfs: Remove the macro XFS_BUF_PTR
  xfs: Remove macro XFS_BUF_SET_START
  xfs: Remove macro XFS_BUF_HOLD
  xfs: Remove macro XFS_BUF_BUSY and family
  xfs: Remove the macro XFS_BUF_ERROR and family
  xfs: Remove the macro XFS_BUF_BFLAGS
parents c44efbaa e5702805

fs/xfs/linux-2.6/xfs_buf.c

+7 −8
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ _xfs_buf_read( 
	bp->b_flags |= flags & (XBF_READ | XBF_ASYNC | XBF_READ_AHEAD);



	status = xfs_buf_iorequest(bp);

	if (status || XFS_BUF_ISERROR(bp) || (flags & XBF_ASYNC))

	if (status || bp->b_error || (flags & XBF_ASYNC))

		return status;

	return xfs_buf_iowait(bp);

}
@@ -679,7 +679,6 @@ xfs_buf_read_uncached( 
	/* set up the buffer for a read IO */

	XFS_BUF_SET_ADDR(bp, daddr);

	XFS_BUF_READ(bp);

	XFS_BUF_BUSY(bp);



	xfsbdstrat(mp, bp);

	error = xfs_buf_iowait(bp);
@@ -1069,7 +1068,7 @@ xfs_bioerror( 
	/*

	 * No need to wait until the buffer is unpinned, we aren't flushing it.

	 */

	XFS_BUF_ERROR(bp, EIO);

	xfs_buf_ioerror(bp, EIO);



	/*

	 * We're calling xfs_buf_ioend, so delete XBF_DONE flag.
@@ -1094,7 +1093,7 @@ STATIC int 
xfs_bioerror_relse(

	struct xfs_buf	*bp)

{

	int64_t		fl = XFS_BUF_BFLAGS(bp);

	int64_t		fl = bp->b_flags;

	/*

	 * No need to wait until the buffer is unpinned.

	 * We aren't flushing it.
@@ -1115,7 +1114,7 @@ xfs_bioerror_relse( 
		 * There's no reason to mark error for

		 * ASYNC buffers.

		 */

		XFS_BUF_ERROR(bp, EIO);

		xfs_buf_ioerror(bp, EIO);

		XFS_BUF_FINISH_IOWAIT(bp);

	} else {

		xfs_buf_relse(bp);
@@ -1324,7 +1323,7 @@ xfs_buf_offset( 
	struct page		*page;



	if (bp->b_flags & XBF_MAPPED)

		return XFS_BUF_PTR(bp) + offset;

		return bp->b_addr + offset;



	offset += bp->b_offset;

	page = bp->b_pages[offset >> PAGE_SHIFT];
@@ -1484,7 +1483,7 @@ xfs_setsize_buftarg_flags( 
	if (set_blocksize(btp->bt_bdev, sectorsize)) {

		xfs_warn(btp->bt_mount,

			"Cannot set_blocksize to %u on device %s\n",

			sectorsize, XFS_BUFTARG_NAME(btp));

			sectorsize, xfs_buf_target_name(btp));

		return EINVAL;

	}
@@ -1681,7 +1680,7 @@ xfs_buf_delwri_split( 
	list_for_each_entry_safe(bp, n, dwq, b_list) {

		ASSERT(bp->b_flags & XBF_DELWRI);



		if (!XFS_BUF_ISPINNED(bp) && xfs_buf_trylock(bp)) {

		if (!xfs_buf_ispinned(bp) && xfs_buf_trylock(bp)) {

			if (!force &&

			    time_before(jiffies, bp->b_queuetime + age)) {

				xfs_buf_unlock(bp);

fs/xfs/linux-2.6/xfs_buf.h

+11 −21
Original line number Diff line number Diff line
@@ -228,11 +228,15 @@ extern void xfs_buf_delwri_promote(xfs_buf_t *); 
extern int xfs_buf_init(void);

extern void xfs_buf_terminate(void);



#define xfs_buf_target_name(target)	\

	({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })

static inline const char *

xfs_buf_target_name(struct xfs_buftarg *target)

{

	static char __b[BDEVNAME_SIZE];



	return bdevname(target->bt_bdev, __b);

}





#define XFS_BUF_BFLAGS(bp)	((bp)->b_flags)

#define XFS_BUF_ZEROFLAGS(bp) \

	((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \

			    XBF_SYNCIO|XBF_FUA|XBF_FLUSH))
@@ -251,23 +255,14 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_UNDELAYWRITE(bp)	xfs_buf_delwri_dequeue(bp)

#define XFS_BUF_ISDELAYWRITE(bp)	((bp)->b_flags & XBF_DELWRI)



#define XFS_BUF_ERROR(bp,no)	xfs_buf_ioerror(bp,no)

#define XFS_BUF_GETERROR(bp)	xfs_buf_geterror(bp)

#define XFS_BUF_ISERROR(bp)	(xfs_buf_geterror(bp) ? 1 : 0)



#define XFS_BUF_DONE(bp)	((bp)->b_flags |= XBF_DONE)

#define XFS_BUF_UNDONE(bp)	((bp)->b_flags &= ~XBF_DONE)

#define XFS_BUF_ISDONE(bp)	((bp)->b_flags & XBF_DONE)



#define XFS_BUF_BUSY(bp)	do { } while (0)

#define XFS_BUF_UNBUSY(bp)	do { } while (0)

#define XFS_BUF_ISBUSY(bp)	(1)



#define XFS_BUF_ASYNC(bp)	((bp)->b_flags |= XBF_ASYNC)

#define XFS_BUF_UNASYNC(bp)	((bp)->b_flags &= ~XBF_ASYNC)

#define XFS_BUF_ISASYNC(bp)	((bp)->b_flags & XBF_ASYNC)



#define XFS_BUF_HOLD(bp)	xfs_buf_hold(bp)

#define XFS_BUF_READ(bp)	((bp)->b_flags |= XBF_READ)

#define XFS_BUF_UNREAD(bp)	((bp)->b_flags &= ~XBF_READ)

#define XFS_BUF_ISREAD(bp)	((bp)->b_flags & XBF_READ)
@@ -276,10 +271,6 @@ void xfs_buf_stale(struct xfs_buf *bp); 
#define XFS_BUF_UNWRITE(bp)	((bp)->b_flags &= ~XBF_WRITE)

#define XFS_BUF_ISWRITE(bp)	((bp)->b_flags & XBF_WRITE)



#define XFS_BUF_SET_START(bp)			do { } while (0)



#define XFS_BUF_PTR(bp)			(xfs_caddr_t)((bp)->b_addr)

#define XFS_BUF_SET_PTR(bp, val, cnt)	xfs_buf_associate_memory(bp, val, cnt)

#define XFS_BUF_ADDR(bp)		((bp)->b_bn)

#define XFS_BUF_SET_ADDR(bp, bno)	((bp)->b_bn = (xfs_daddr_t)(bno))

#define XFS_BUF_OFFSET(bp)		((bp)->b_file_offset)
@@ -299,14 +290,13 @@ xfs_buf_set_ref( 
#define XFS_BUF_SET_VTYPE_REF(bp, type, ref)	xfs_buf_set_ref(bp, ref)

#define XFS_BUF_SET_VTYPE(bp, type)		do { } while (0)



#define XFS_BUF_ISPINNED(bp)	atomic_read(&((bp)->b_pin_count))

static inline int xfs_buf_ispinned(struct xfs_buf *bp)

{

	return atomic_read(&bp->b_pin_count);

}



#define XFS_BUF_FINISH_IOWAIT(bp)	complete(&bp->b_iowait);



#define XFS_BUF_SET_TARGET(bp, target)	((bp)->b_target = (target))

#define XFS_BUF_TARGET(bp)		((bp)->b_target)

#define XFS_BUFTARG_NAME(target)	xfs_buf_target_name(target)



static inline void xfs_buf_relse(xfs_buf_t *bp)

{

	xfs_buf_unlock(bp);

fs/xfs/linux-2.6/xfs_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ xfs_sync_fsdata( 
	 * between there and here.

	 */

	bp = xfs_getsb(mp, 0);

	if (XFS_BUF_ISPINNED(bp))

	if (xfs_buf_ispinned(bp))

		xfs_log_force(mp, 0);



	return xfs_bwrite(mp, bp);

fs/xfs/quota/xfs_dquot.c

+6 −10
Original line number Diff line number Diff line
@@ -318,10 +318,9 @@ xfs_qm_init_dquot_blk( 
	int		curid, i;



	ASSERT(tp);

	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));



	d = (xfs_dqblk_t *)XFS_BUF_PTR(bp);

	d = bp->b_addr;



	/*

	 * ID of the first dquot in the block - id's are zero based.
@@ -403,7 +402,7 @@ xfs_qm_dqalloc( 
			       dqp->q_blkno,

			       mp->m_quotainfo->qi_dqchunklen,

			       0);

	if (!bp || (error = XFS_BUF_GETERROR(bp)))

	if (!bp || (error = xfs_buf_geterror(bp)))

		goto error1;

	/*

	 * Make a chunk of dquots out of this buffer and log
@@ -534,13 +533,12 @@ xfs_qm_dqtobp( 
			return XFS_ERROR(error);

	}



	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));



	/*

	 * calculate the location of the dquot inside the buffer.

	 */

	ddq = (struct xfs_disk_dquot *)(XFS_BUF_PTR(bp) + dqp->q_bufoffset);

	ddq = bp->b_addr + dqp->q_bufoffset;



	/*

	 * A simple sanity check in case we got a corrupted dquot...
@@ -553,7 +551,6 @@ xfs_qm_dqtobp( 
			xfs_trans_brelse(tp, bp);

			return XFS_ERROR(EIO);

		}

		XFS_BUF_BUSY(bp); /* We dirtied this */

	}



	*O_bpp = bp;
@@ -622,7 +619,6 @@ xfs_qm_dqread( 
	 * this particular dquot was repaired. We still aren't afraid to

	 * brelse it because we have the changes incore.

	 */

	ASSERT(XFS_BUF_ISBUSY(bp));

	ASSERT(xfs_buf_islocked(bp));

	xfs_trans_brelse(tp, bp);
@@ -1204,7 +1200,7 @@ xfs_qm_dqflush( 
	/*

	 * Calculate the location of the dquot inside the buffer.

	 */

	ddqp = (struct xfs_disk_dquot *)(XFS_BUF_PTR(bp) + dqp->q_bufoffset);

	ddqp = bp->b_addr + dqp->q_bufoffset;



	/*

	 * A simple sanity check in case we got a corrupted dquot..
@@ -1240,7 +1236,7 @@ xfs_qm_dqflush( 
	 * If the buffer is pinned then push on the log so we won't

	 * get stuck waiting in the write for too long.

	 */

	if (XFS_BUF_ISPINNED(bp)) {

	if (xfs_buf_ispinned(bp)) {

		trace_xfs_dqflush_force(dqp);

		xfs_log_force(mp, 0);

	}
@@ -1447,7 +1443,7 @@ xfs_qm_dqflock_pushbuf_wait( 
		goto out_lock;



	if (XFS_BUF_ISDELAYWRITE(bp)) {

		if (XFS_BUF_ISPINNED(bp))

		if (xfs_buf_ispinned(bp))

			xfs_log_force(mp, 0);

		xfs_buf_delwri_promote(bp);

		wake_up_process(bp->b_target->bt_task);

fs/xfs/quota/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ xfs_qm_reset_dqcounts( 
	do_div(j, sizeof(xfs_dqblk_t));

	ASSERT(mp->m_quotainfo->qi_dqperchunk == j);

#endif

	ddq = (xfs_disk_dquot_t *)XFS_BUF_PTR(bp);

	ddq = bp->b_addr;

	for (j = 0; j < mp->m_quotainfo->qi_dqperchunk; j++) {

		/*

		 * Do a sanity check, and if needed, repair the dqblk. Don't