aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-10-18 02:19:37 -0400
committerDave Chinner <david@fromorbit.com>2018-10-18 02:19:37 -0400
commitfc439464e3ee299d8a3d502d7d24d4d6a5686879 (patch)
treee793497208b23d0f3e3f1366116e51917c707f58 /fs/xfs
parent0365c5d6c3d4bcf17a1aa38719e48351932c62b6 (diff)
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>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_iomap.c6
-rw-r--r--fs/xfs/xfs_reflink.c12
-rw-r--r--fs/xfs/xfs_reflink.h2
3 files changed, 8 insertions, 12 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 9b572a1fbd42..bdba6b91598a 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -569,10 +569,8 @@ xfs_file_iomap_begin_delay(
569 if (xfs_is_reflink_inode(ip) && 569 if (xfs_is_reflink_inode(ip) &&
570 ((flags & IOMAP_WRITE) || 570 ((flags & IOMAP_WRITE) ||
571 got.br_state != XFS_EXT_UNWRITTEN)) { 571 got.br_state != XFS_EXT_UNWRITTEN)) {
572 bool shared;
573
574 xfs_trim_extent(&got, offset_fsb, end_fsb - offset_fsb); 572 xfs_trim_extent(&got, offset_fsb, end_fsb - offset_fsb);
575 error = xfs_reflink_reserve_cow(ip, &got, &shared); 573 error = xfs_reflink_reserve_cow(ip, &got);
576 if (error) 574 if (error)
577 goto out_unlock; 575 goto out_unlock;
578 } 576 }
@@ -1097,7 +1095,7 @@ xfs_file_iomap_begin(
1097 if (error) 1095 if (error)
1098 goto out_unlock; 1096 goto out_unlock;
1099 } else { 1097 } else {
1100 error = xfs_reflink_reserve_cow(ip, &imap, &shared); 1098 error = xfs_reflink_reserve_cow(ip, &imap);
1101 if (error) 1099 if (error)
1102 goto out_unlock; 1100 goto out_unlock;
1103 } 1101 }
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 42ea7bab9144..3ce4d9dbdc74 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -241,7 +241,7 @@ xfs_reflink_trim_around_shared(
241/* 241/*
242 * Trim the passed in imap to the next shared/unshared extent boundary, and 242 * Trim the passed in imap to the next shared/unshared extent boundary, and
243 * if imap->br_startoff points to a shared extent reserve space for it in the 243 * if imap->br_startoff points to a shared extent reserve space for it in the
244 * COW fork. In this case *shared is set to true, else to false. 244 * COW fork.
245 * 245 *
246 * Note that imap will always contain the block numbers for the existing blocks 246 * Note that imap will always contain the block numbers for the existing blocks
247 * in the data fork, as the upper layers need them for read-modify-write 247 * in the data fork, as the upper layers need them for read-modify-write
@@ -250,14 +250,14 @@ xfs_reflink_trim_around_shared(
250int 250int
251xfs_reflink_reserve_cow( 251xfs_reflink_reserve_cow(
252 struct xfs_inode *ip, 252 struct xfs_inode *ip,
253 struct xfs_bmbt_irec *imap, 253 struct xfs_bmbt_irec *imap)
254 bool *shared)
255{ 254{
256 struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK); 255 struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
257 struct xfs_bmbt_irec got; 256 struct xfs_bmbt_irec got;
258 int error = 0; 257 int error = 0;
259 bool eof = false, trimmed; 258 bool eof = false, trimmed;
260 struct xfs_iext_cursor icur; 259 struct xfs_iext_cursor icur;
260 bool shared;
261 261
262 /* 262 /*
263 * Search the COW fork extent list first. This serves two purposes: 263 * Search the COW fork extent list first. This serves two purposes:
@@ -273,18 +273,16 @@ xfs_reflink_reserve_cow(
273 if (!eof && got.br_startoff <= imap->br_startoff) { 273 if (!eof && got.br_startoff <= imap->br_startoff) {
274 trace_xfs_reflink_cow_found(ip, imap); 274 trace_xfs_reflink_cow_found(ip, imap);
275 xfs_trim_extent(imap, got.br_startoff, got.br_blockcount); 275 xfs_trim_extent(imap, got.br_startoff, got.br_blockcount);
276
277 *shared = true;
278 return 0; 276 return 0;
279 } 277 }
280 278
281 /* Trim the mapping to the nearest shared extent boundary. */ 279 /* Trim the mapping to the nearest shared extent boundary. */
282 error = xfs_reflink_trim_around_shared(ip, imap, shared, &trimmed); 280 error = xfs_reflink_trim_around_shared(ip, imap, &shared, &trimmed);
283 if (error) 281 if (error)
284 return error; 282 return error;
285 283
286 /* Not shared? Just report the (potentially capped) extent. */ 284 /* Not shared? Just report the (potentially capped) extent. */
287 if (!*shared) 285 if (!shared)
288 return 0; 286 return 0;
289 287
290 /* 288 /*
diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index c585ad9552b2..b77f4079022a 100644
--- 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,
13 struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed); 13 struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed);
14 14
15extern int xfs_reflink_reserve_cow(struct xfs_inode *ip, 15extern int xfs_reflink_reserve_cow(struct xfs_inode *ip,
16 struct xfs_bmbt_irec *imap, bool *shared); 16 struct xfs_bmbt_irec *imap);
17extern int xfs_reflink_allocate_cow(struct xfs_inode *ip, 17extern int xfs_reflink_allocate_cow(struct xfs_inode *ip,
18 struct xfs_bmbt_irec *imap, bool *shared, uint *lockmode); 18 struct xfs_bmbt_irec *imap, bool *shared, uint *lockmode);
19extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset, 19extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,