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

Commit b678573e authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-fixes-for-3.15' into for-next

parents 5ef11eb0 492185ef

fs/xfs/xfs_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	if (!acl)

		goto set_acl;



	error = -EINVAL;

	error = -E2BIG;

	if (acl->a_count > XFS_ACL_MAX_ENTRIES(XFS_M(inode->i_sb)))

		return error;

fs/xfs/xfs_buf_item.c

+0 −19
Original line number Diff line number Diff line
@@ -796,20 +796,6 @@ xfs_buf_item_init( 
		bip->bli_formats[i].blf_map_size = map_size;

	}



#ifdef XFS_TRANS_DEBUG

	/*

	 * Allocate the arrays for tracking what needs to be logged

	 * and what our callers request to be logged.  bli_orig

	 * holds a copy of the original, clean buffer for comparison

	 * against, and bli_logged keeps a 1 bit flag per byte in

	 * the buffer to indicate which bytes the callers have asked

	 * to have logged.

	 */

	bip->bli_orig = kmem_alloc(BBTOB(bp->b_length), KM_SLEEP);

	memcpy(bip->bli_orig, bp->b_addr, BBTOB(bp->b_length));

	bip->bli_logged = kmem_zalloc(BBTOB(bp->b_length) / NBBY, KM_SLEEP);

#endif



	/*

	 * Put the buf item into the list of items attached to the

	 * buffer at the front.
@@ -957,11 +943,6 @@ STATIC void 
xfs_buf_item_free(

	xfs_buf_log_item_t	*bip)

{

#ifdef XFS_TRANS_DEBUG

	kmem_free(bip->bli_orig);

	kmem_free(bip->bli_logged);

#endif /* XFS_TRANS_DEBUG */



	xfs_buf_item_free_format(bip);

	kmem_zone_free(xfs_buf_item_zone, bip);

}

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ xfs_qm_dqread( 


	if (flags & XFS_QMOPT_DQALLOC) {

		tp = xfs_trans_alloc(mp, XFS_TRANS_QM_DQALLOC);

		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_attrsetm,

		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_qm_dqalloc,

					  XFS_QM_DQALLOC_SPACE_RES(mp), 0);

		if (error)

			goto error1;

fs/xfs/xfs_log.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void xlog_iodone(struct xfs_buf *); 
struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);

void	  xfs_log_ticket_put(struct xlog_ticket *ticket);



int	xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,

void	xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,

				xfs_lsn_t *commit_lsn, int flags);

bool	xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);

fs/xfs/xfs_log_cil.c

+1 −2
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ xlog_cil_empty( 
 * background commit, returns without it held once background commits are

 * allowed again.

 */

int

void

xfs_log_commit_cil(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,
@@ -767,7 +767,6 @@ xfs_log_commit_cil( 
	xlog_cil_push_background(log);



	up_read(&cil->xc_ctx_lock);

	return 0;

}



/*