]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
xfs: mute some sparse warnings
authorEryu Guan <guaneryu@gmail.com>
Tue, 5 Apr 2016 23:47:21 +0000 (09:47 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 5 Apr 2016 23:47:21 +0000 (09:47 +1000)
These three warnings are fixed:

fs/xfs/xfs_inode.c:1033:44: warning: Using plain integer as NULL pointer
fs/xfs/xfs_inode_item.c:525:20: warning: context imbalance in 'xfs_inode_item_push' - unexpected unlock
fs/xfs/xfs_dquot.c:696:1: warning: symbol 'xfs_dq_get_next_id' was not declared. Should it be static?

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_dquot.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode_item.c

index 316b2a1bdba5f6da82f1bad0dcbc0708151a59d2..8f51370c95c4bf3e9c479530bc277347f9e61b25 100644 (file)
@@ -692,7 +692,7 @@ error0:
  * end of the chunk, skip ahead to first id in next allocated chunk
  * using the SEEK_DATA interface.
  */
-int
+static int
 xfs_dq_get_next_id(
        xfs_mount_t             *mp,
        uint                    type,
index 96f606deee313aed506b7e7ee229fc801ba5de80..1445a99a6868bf284eac396dd84a683b30d519d7 100644 (file)
@@ -1030,7 +1030,7 @@ xfs_dir_ialloc(
                        tp->t_flags &= ~(XFS_TRANS_DQ_DIRTY);
                }
 
-               code = xfs_trans_roll(&tp, 0);
+               code = xfs_trans_roll(&tp, NULL);
                if (committed != NULL)
                        *committed = 1;
 
index c48b5b18d771fab685e23c03613a1c6e762efcb4..d02cbab18f458b536cf66e5d76a91de34e839dcd 100644 (file)
@@ -479,6 +479,8 @@ STATIC uint
 xfs_inode_item_push(
        struct xfs_log_item     *lip,
        struct list_head        *buffer_list)
+               __releases(&lip->li_ailp->xa_lock)
+               __acquires(&lip->li_ailp->xa_lock)
 {
        struct xfs_inode_log_item *iip = INODE_ITEM(lip);
        struct xfs_inode        *ip = iip->ili_inode;