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

Commit 04c28605 authored by Brian Foster's avatar Brian Foster Committed by Greg Kroah-Hartman
Browse files

xfs: fix up quotacheck buffer list error handling 



commit 20e8a063786050083fe05b4f45be338c60b49126 upstream.

The quotacheck error handling of the delwri buffer list assumes the
resident buffers are locked and doesn't clear the _XBF_DELWRI_Q flag
on the buffers that are dequeued. This can lead to assert failures
on buffer release and possibly other locking problems.

Move this code to a delwri queue cancel helper function to
encapsulate the logic required to properly release buffers from a
delwri queue. Update the helper to clear the delwri queue flag and
call it from quotacheck.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 955f1151

fs/xfs/xfs_buf.c

+24 −0
Original line number Diff line number Diff line
@@ -982,6 +982,8 @@ void 
xfs_buf_unlock(

	struct xfs_buf		*bp)

{

	ASSERT(xfs_buf_islocked(bp));



	XB_CLEAR_OWNER(bp);

	up(&bp->b_sema);
@@ -1697,6 +1699,28 @@ error: 
	return NULL;

}



/*

 * Cancel a delayed write list.

 *

 * Remove each buffer from the list, clear the delwri queue flag and drop the

 * associated buffer reference.

 */

void

xfs_buf_delwri_cancel(

	struct list_head	*list)

{

	struct xfs_buf		*bp;



	while (!list_empty(list)) {

		bp = list_first_entry(list, struct xfs_buf, b_list);



		xfs_buf_lock(bp);

		bp->b_flags &= ~_XBF_DELWRI_Q;

		list_del_init(&bp->b_list);

		xfs_buf_relse(bp);

	}

}



/*

 * Add a buffer to the delayed write list.

 *

fs/xfs/xfs_buf.h

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *, 
extern xfs_caddr_t xfs_buf_offset(xfs_buf_t *, size_t);



/* Delayed Write Buffer Routines */

extern void xfs_buf_delwri_cancel(struct list_head *);

extern bool xfs_buf_delwri_queue(struct xfs_buf *, struct list_head *);

extern int xfs_buf_delwri_submit(struct list_head *);

extern int xfs_buf_delwri_submit_nowait(struct list_head *);

fs/xfs/xfs_qm.c

+1 −6
Original line number Diff line number Diff line
@@ -1359,12 +1359,7 @@ xfs_qm_quotacheck( 
	mp->m_qflags |= flags;



 error_return:

	while (!list_empty(&buffer_list)) {

		struct xfs_buf *bp =

			list_first_entry(&buffer_list, struct xfs_buf, b_list);

		list_del_init(&bp->b_list);

		xfs_buf_relse(bp);

	}

	xfs_buf_delwri_cancel(&buffer_list);



	if (error) {

		xfs_warn(mp,