xfs
[Top] [All Lists]

[PATCH v2] xfs: mute some sparse warnings

To: xfs@xxxxxxxxxxx
Subject: [PATCH v2] xfs: mute some sparse warnings
From: Eryu Guan <guaneryu@xxxxxxxxx>
Date: Sun, 27 Mar 2016 12:28:51 +0800
Cc: Eryu Guan <guaneryu@xxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v26H06ULpE3yVAOWNsRxAHGyZQRizwHn1dVinAlTQys=; b=K4hiTvO0yrecyakWMtDPnHJbJ1kaLqzaxyan6X8MEZjgda59bXaVbtjU1c7/dJWA1o miv8Ui3cI5FD4xIwJ9U99vFrxXY9xkllg58MN8VJcWRoD1v1QqKhF6dPb2XiqrMBo4wl lUyoXUyJMIIcuoG90OkMjjszherfa9GKWUXUHdiUBR782R6T8/jGoUs6O2bVDBn1Vrd4 BTzevhX7g6bAG7qqwaP+M2FrlYh0aCWvtm+0jQSrdZIcqUoDoqeLx5dLanfeteyP/iS6 MpLFKgX/u+hVLmXxXICbhSgQnd95F9JKchZuP3+3zAq1m8PlyIuxGs7zf3EvqppgLlbO X/qg==
In-reply-to: <1458929042-23991-1-git-send-email-guaneryu@xxxxxxxxx>
References: <1458929042-23991-1-git-send-email-guaneryu@xxxxxxxxx>
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?

Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Eryu Guan <guaneryu@xxxxxxxxx>
---

v2:
- fix lock annotation format

 fs/xfs/xfs_dquot.c      | 2 +-
 fs/xfs/xfs_inode.c      | 2 +-
 fs/xfs/xfs_inode_item.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 316b2a1..8f51370 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -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,
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 96f606d..1445a99 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -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;
 
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index c48b5b1..d02cbab 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -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;
-- 
2.5.5

<Prev in Thread] Current Thread [Next in Thread>