xfs: remove unused flags arg from getsb interfaces

Source kernel commit: 8c9ce2f707a1571782b4d3d100af627b6d147357

The flags value is always passed as 0 so remove the argument.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index bcf931b77b0bae38a8002a7699e747aef767632a..cff275464c3725e6f74247e5e55a8dcf7f4801f8 100644 (file)
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -88,7 +88,7 @@ void  libxfs_trans_cancel(struct xfs_trans *);
 /* cancel dfops associated with a transaction */
 void xfs_defer_cancel(struct xfs_trans *);
 
-struct xfs_buf *libxfs_trans_getsb(struct xfs_trans *, struct xfs_mount *, int);
+struct xfs_buf *libxfs_trans_getsb(struct xfs_trans *, struct xfs_mount *);
 
 void   libxfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
 void   libxfs_trans_log_inode (struct xfs_trans *, struct xfs_inode *,

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 173d496d46e3df17ea5cc08b5938a4d2c31385bc..a8d9584aac56fcd89f22f8f3f70a3d40d0a2393b 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -178,7 +178,7 @@ extern void libxfs_putbuf (xfs_buf_t *);
 
 extern void    libxfs_readbuf_verify(struct xfs_buf *bp,
                        const struct xfs_buf_ops *ops);
-extern xfs_buf_t *libxfs_getsb(struct xfs_mount *, int);
+extern xfs_buf_t *libxfs_getsb(struct xfs_mount *);
 extern void    libxfs_bcache_purge(void);
 extern void    libxfs_bcache_free(void);
 extern void    libxfs_bcache_flush(void);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index e3ff58424fc4aa81b5d814bf317ca7a2c70a1e0a..998862afa99570b6dc9dc2cc30106e99edfd9fcf 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -476,10 +476,10 @@ libxfs_trace_putbuf(const char *func, const char *file, int line, xfs_buf_t *bp)
 
 
 xfs_buf_t *
-libxfs_getsb(xfs_mount_t *mp, int flags)
+libxfs_getsb(xfs_mount_t *mp)
 {
        return libxfs_readbuf(mp->m_ddev_targp, XFS_SB_DADDR,
-                               XFS_FSS_TO_BB(mp, 1), flags, &xfs_sb_buf_ops);
+                               XFS_FSS_TO_BB(mp, 1), 0, &xfs_sb_buf_ops);
 }
 
 kmem_zone_t                    *xfs_buf_zone;

diff --git a/libxfs/trans.c b/libxfs/trans.c
index caeb9103c06666768ac01a897f9779f628c23fe8..713641a8f8646a444a40d861a7b5099bfb91b908 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -461,8 +461,7 @@ libxfs_trans_get_buf_map(
 xfs_buf_t *
 libxfs_trans_getsb(
        xfs_trans_t             *tp,
-       struct xfs_mount        *mp,
-       int                     flags)
+       struct xfs_mount        *mp)
 {
        xfs_buf_t               *bp;
        struct xfs_buf_log_item *bip;
@@ -470,7 +469,7 @@ libxfs_trans_getsb(
        DEFINE_SINGLE_BUF_MAP(map, XFS_SB_DADDR, len);
 
        if (tp == NULL)
-               return libxfs_getsb(mp, flags);
+               return libxfs_getsb(mp);
 
        bp = xfs_trans_buf_item_match(tp, mp->m_dev, &map, 1);
        if (bp != NULL) {
@@ -482,7 +481,7 @@ libxfs_trans_getsb(
                return bp;
        }
 
-       bp = libxfs_getsb(mp, flags);
+       bp = libxfs_getsb(mp);
        if (bp == NULL)
                return NULL;
 

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index f4bcffe19c0fa882af45c81c54a544b824f2ef65..6a375ec39bedc82520731a1683688d72d501da3c 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -904,7 +904,7 @@ xfs_log_sb(
        struct xfs_trans        *tp)
 {
        struct xfs_mount        *mp = tp->t_mountp;
-       struct xfs_buf          *bp = xfs_trans_getsb(tp, mp, 0);
+       struct xfs_buf          *bp = xfs_trans_getsb(tp, mp);
 
        mp->m_sb.sb_icount = percpu_counter_sum(&mp->m_icount);
        mp->m_sb.sb_ifree = percpu_counter_sum(&mp->m_ifree);
@@ -1034,7 +1034,7 @@ xfs_sync_sb_buf(
        if (error)
                return error;
 
-       bp = xfs_trans_getsb(tp, mp, 0);
+       bp = xfs_trans_getsb(tp, mp);
        xfs_log_sb(tp);
        xfs_trans_bhold(tp, bp);
        xfs_trans_set_sync(tp);

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 0adaa65d19f8df0a54ab58b889ae453aff25ef00..76010fd16aa2af5cc8fdabe3afbe1e614b544451 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -4126,7 +4126,9 @@ main(
        /*
         * Mark the filesystem ok.
         */
-       buf = libxfs_getsb(mp, LIBXFS_EXIT_ON_FAILURE);
+       buf = libxfs_getsb(mp);
+       if (!buf || buf->b_error)
+               exit(1);
        (XFS_BUF_TO_SBP(buf))->sb_inprogress = 0;
        libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 

diff --git a/repair/phase5.c b/repair/phase5.c
index 314785e0632184b572633737c6359431b1b7dbac..780592b04849751069fa4a05d41d8f78b1d1abd6 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -2177,7 +2177,7 @@ sync_sb(xfs_mount_t *mp)
 {
        xfs_buf_t       *bp;
 
-       bp = libxfs_getsb(mp, 0);
+       bp = libxfs_getsb(mp);
        if (!bp)
                do_error(_("couldn't get superblock\n"));
 

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 2810f8bb7e8519a4b8f01344241dfcafc8aa325b..ce70e2de1553b017216b8837a786090419bf9248 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -1046,7 +1046,7 @@ _("Warning:  project quota information would be cleared.\n"
        /*
         * Clear the quota flags if they're on.
         */
-       sbp = libxfs_getsb(mp, 0);
+       sbp = libxfs_getsb(mp);
        if (!sbp)
                do_error(_("couldn't get superblock\n"));