xfs: simplify xfs_ag_resv_free signature

It's not possible to fail at increasing fdblocks, so get rid of all the
error returns here.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index 7efe395ead1edcd3a6724f06e8a406d5a70f94e8..435d05d88590bd0e1ec582904a3480a281d6c65f 100644 (file)
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h
@@ -269,7 +269,6 @@
 #define trace_xfs_ag_resv_critical(...)                ((void) 0)
 #define trace_xfs_ag_resv_needed(...)          ((void) 0)
 #define trace_xfs_ag_resv_free(...)            ((void) 0)
-#define trace_xfs_ag_resv_free_error(...)      ((void) 0)
 #define trace_xfs_ag_resv_init(...)            ((void) 0)
 #define trace_xfs_ag_resv_init_error(...)      ((void) 0)
 #define trace_xfs_ag_resv_alloc_extent(...)    ((void) 0)

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index ddd5584f23e783e33f13289747039e99fadc68db..f22d58ad04063e31f9ba610b1d0d773843050995 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -942,9 +942,7 @@ xfs_ag_shrink_space(
         * Disable perag reservations so it doesn't cause the allocation request
         * to fail. We'll reestablish reservation before we return.
         */
-       error = xfs_ag_resv_free(pag);
-       if (error)
-               return error;
+       xfs_ag_resv_free(pag);
 
        /* internal log shouldn't also show up in the free space btrees */
        error = xfs_alloc_vextent_exact_bno(&args,

diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
index 3a80b1613e182d4f2ba73d6634036a86cce0648a..542740bb850d6d8bd7382b5b41a6855ff594ce84 100644 (file)
--- a/libxfs/xfs_ag_resv.c
+++ b/libxfs/xfs_ag_resv.c
@@ -125,14 +125,13 @@ xfs_ag_resv_needed(
 }
 
 /* Clean out a reservation */
-static int
+static void
 __xfs_ag_resv_free(
        struct xfs_perag                *pag,
        enum xfs_ag_resv_type           type)
 {
        struct xfs_ag_resv              *resv;
        xfs_extlen_t                    oldresv;
-       int                             error;
 
        trace_xfs_ag_resv_free(pag, type, 0);
 
@@ -148,30 +147,19 @@ __xfs_ag_resv_free(
                oldresv = resv->ar_orig_reserved;
        else
                oldresv = resv->ar_reserved;
-       error = xfs_mod_fdblocks(pag->pag_mount, oldresv, true);
+       xfs_mod_fdblocks(pag->pag_mount, oldresv, true);
        resv->ar_reserved = 0;
        resv->ar_asked = 0;
        resv->ar_orig_reserved = 0;
-
-       if (error)
-               trace_xfs_ag_resv_free_error(pag->pag_mount, pag->pag_agno,
-                               error, _RET_IP_);
-       return error;
 }
 
 /* Free a per-AG reservation. */
-int
+void
 xfs_ag_resv_free(
        struct xfs_perag                *pag)
 {
-       int                             error;
-       int                             err2;
-
-       error = __xfs_ag_resv_free(pag, XFS_AG_RESV_RMAPBT);
-       err2 = __xfs_ag_resv_free(pag, XFS_AG_RESV_METADATA);
-       if (err2 && !error)
-               error = err2;
-       return error;
+       __xfs_ag_resv_free(pag, XFS_AG_RESV_RMAPBT);
+       __xfs_ag_resv_free(pag, XFS_AG_RESV_METADATA);
 }
 
 static int

diff --git a/libxfs/xfs_ag_resv.h b/libxfs/xfs_ag_resv.h
index b74b210008ea7e973f296b3fca524887fe27bef3..ff20ed93de77243610125edd75b8d69e4f101e20 100644 (file)
--- a/libxfs/xfs_ag_resv.h
+++ b/libxfs/xfs_ag_resv.h
@@ -6,7 +6,7 @@
 #ifndef __XFS_AG_RESV_H__
 #define        __XFS_AG_RESV_H__
 
-int xfs_ag_resv_free(struct xfs_perag *pag);
+void xfs_ag_resv_free(struct xfs_perag *pag);
 int xfs_ag_resv_init(struct xfs_perag *pag, struct xfs_trans *tp);
 
 bool xfs_ag_resv_critical(struct xfs_perag *pag, enum xfs_ag_resv_type type);