xfs: remove the unused shared argument to xfs_reflink_reserve_cow

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 9b572a1fbd42e2585442b40c5918e1c2c0c1140f..bdba6b91598a66523e199b7a09f8f185ad88261c 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -569,10 +569,8 @@ xfs_file_iomap_begin_delay(
                if (xfs_is_reflink_inode(ip) &&
                    ((flags & IOMAP_WRITE) ||
                     got.br_state != XFS_EXT_UNWRITTEN)) {
-                       bool            shared;
-
                        xfs_trim_extent(&got, offset_fsb, end_fsb - offset_fsb);
-                       error = xfs_reflink_reserve_cow(ip, &got, &shared);
+                       error = xfs_reflink_reserve_cow(ip, &got);
                        if (error)
                                goto out_unlock;
                }
@@ -1097,7 +1095,7 @@ xfs_file_iomap_begin(
                        if (error)
                                goto out_unlock;
                } else {
-                       error = xfs_reflink_reserve_cow(ip, &imap, &shared);
+                       error = xfs_reflink_reserve_cow(ip, &imap);
                        if (error)
                                goto out_unlock;
                }

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 42ea7bab9144cc026f50d802acc31c42ab7f0858..3ce4d9dbdc74ffb34c8b54cdcac6284841b4aff2 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -241,7 +241,7 @@ xfs_reflink_trim_around_shared(
 /*
  * Trim the passed in imap to the next shared/unshared extent boundary, and
  * if imap->br_startoff points to a shared extent reserve space for it in the
- * COW fork.  In this case *shared is set to true, else to false.
+ * COW fork.
  *
  * Note that imap will always contain the block numbers for the existing blocks
  * in the data fork, as the upper layers need them for read-modify-write
@@ -250,14 +250,14 @@ xfs_reflink_trim_around_shared(
 int
 xfs_reflink_reserve_cow(
        struct xfs_inode        *ip,
-       struct xfs_bmbt_irec    *imap,
-       bool                    *shared)
+       struct xfs_bmbt_irec    *imap)
 {
        struct xfs_ifork        *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
        struct xfs_bmbt_irec    got;
        int                     error = 0;
        bool                    eof = false, trimmed;
        struct xfs_iext_cursor  icur;
+       bool                    shared;
 
        /*
         * Search the COW fork extent list first.  This serves two purposes:
@@ -273,18 +273,16 @@ xfs_reflink_reserve_cow(
        if (!eof && got.br_startoff <= imap->br_startoff) {
                trace_xfs_reflink_cow_found(ip, imap);
                xfs_trim_extent(imap, got.br_startoff, got.br_blockcount);
-
-               *shared = true;
                return 0;
        }
 
        /* Trim the mapping to the nearest shared extent boundary. */
-       error = xfs_reflink_trim_around_shared(ip, imap, shared, &trimmed);
+       error = xfs_reflink_trim_around_shared(ip, imap, &shared, &trimmed);
        if (error)
                return error;
 
        /* Not shared?  Just report the (potentially capped) extent. */
-       if (!*shared)
+       if (!shared)
                return 0;
 
        /*

diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index c585ad9552b23ff375fd40c21a6aadab694b8e14..b77f4079022a79dfdc81cf53261f28461c65db90 100644 (file)
--- a/fs/xfs/xfs_reflink.h
+++ b/fs/xfs/xfs_reflink.h
@@ -13,7 +13,7 @@ extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip,
                struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed);
 
 extern int xfs_reflink_reserve_cow(struct xfs_inode *ip,
-               struct xfs_bmbt_irec *imap, bool *shared);
+               struct xfs_bmbt_irec *imap);
 extern int xfs_reflink_allocate_cow(struct xfs_inode *ip,
                struct xfs_bmbt_irec *imap, bool *shared, uint *lockmode);
 extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,