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

Commit a30b0367 authored Sep 02, 2013 by Dave Chinner Committed by Ben Myers Sep 09, 2013

xfs: fix some minor sparse warnings



A couple of simple locking annotations and 0 vs NULL warnings.
Nothing that changes any code behaviour, just removes build noise.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>

parent e9fbbad8

fs/xfs/xfs_bmap.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4450,7 +4450,7 @@ xfs_bmapi_write(
	{		{
	struct xfs_mount *mp = ip->i_mount;		struct xfs_mount *mp = ip->i_mount;
	struct xfs_ifork *ifp;		struct xfs_ifork *ifp;
	struct xfs_bmalloca bma = { 0 }; /* args for xfs_bmap_alloc */		struct xfs_bmalloca bma = { NULL }; /* args for xfs_bmap_alloc */
	xfs_fileoff_t end; /* end of mapped file region */		xfs_fileoff_t end; /* end of mapped file region */
	int eof; /* after the end of extents */		int eof; /* after the end of extents */
	int error; /* error return */		int error; /* error return */

fs/xfs/xfs_dquot_item.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,8 @@ xfs_qm_dqunpin_wait(
	STATIC uint		STATIC uint
	xfs_qm_dquot_logitem_push(		xfs_qm_dquot_logitem_push(
	struct xfs_log_item *lip,		struct xfs_log_item *lip,
	struct list_head *buffer_list)		struct list_head *buffer_list) __releases(&lip->li_ailp->xa_lock)
			__acquires(&lip->li_ailp->xa_lock)
	{		{
	struct xfs_dquot *dqp = DQUOT_ITEM(lip)->qli_dquot;		struct xfs_dquot *dqp = DQUOT_ITEM(lip)->qli_dquot;
	struct xfs_buf *bp = NULL;		struct xfs_buf *bp = NULL;

fs/xfs/xfs_extent_busy.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -160,7 +160,8 @@ xfs_extent_busy_update_extent(
	struct xfs_extent_busy *busyp,		struct xfs_extent_busy *busyp,
	xfs_agblock_t fbno,		xfs_agblock_t fbno,
	xfs_extlen_t flen,		xfs_extlen_t flen,
	bool userdata)		bool userdata) __releases(&pag->pagb_lock)
			__acquires(&pag->pagb_lock)
	{		{
	xfs_agblock_t fend = fbno + flen;		xfs_agblock_t fend = fbno + flen;
	xfs_agblock_t bbno = busyp->bno;		xfs_agblock_t bbno = busyp->bno;

fs/xfs/xfs_ioctl.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ xfs_find_handle(
	int hsize;		int hsize;
	xfs_handle_t handle;		xfs_handle_t handle;
	struct inode *inode;		struct inode *inode;
	struct fd f = {0};		struct fd f = {NULL};
	struct path path;		struct path path;
	int error;		int error;
	struct xfs_inode *ip;		struct xfs_inode *ip;

fs/xfs/xfs_itable.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -541,8 +541,9 @@ xfs_bulkstat_single(
	* at the expense of the error case.		* at the expense of the error case.
	*/		*/

	ino = (xfs_ino_t)*lastinop;		ino = *lastinop;
	error = xfs_bulkstat_one(mp, ino, buffer, sizeof(xfs_bstat_t), 0, &res);		error = xfs_bulkstat_one(mp, ino, buffer, sizeof(xfs_bstat_t),
			NULL, &res);
	if (error) {		if (error) {
	/*		/*
	* Special case way failed, do it the "long" way		* Special case way failed, do it the "long" way