Unsharing blocks is implemented by doing CoW to those blocks. That has a side
effect that some new allocatd blocks remain in inode Cow fork. As unsharing blocks
has no hint that future writes would like come to the blocks that follow the
unshared ones, the extra blocks in Cow fork is meaningless.
This patch makes that no new blocks caused by unshare remain in Cow fork.
The change in xfs_get_extsz_hint() makes the new blocks have more change to be
contigurous in unshare path when there are multiple extents to unshare.
Signed-off-by: Wengang Wang <wen.gang.wang@xxxxxxxxxx>
---
fs/xfs/xfs_inode.c | 17 ++++++++++++++++
fs/xfs/xfs_inode.h | 48 +++++++++++++++++++++++---------------------
fs/xfs/xfs_reflink.c | 7 +++++--
3 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index d55b42b2480d..ade945c8d783 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -58,6 +58,15 @@ xfs_get_extsz_hint(
*/
if (xfs_is_always_cow_inode(ip))
return 0;
+
+ /*
+ * let xfs_buffered_write_iomap_begin() do delayed allocation
+ * in unshare path so that the new blocks have more chance to
+ * be contigurous
+ */
+ if (xfs_iflags_test(ip, XFS_IUNSHARE))
+ return 0;
+
if ((ip->i_diflags & XFS_DIFLAG_EXTSIZE) && ip->i_extsize)
return ip->i_extsize;
if (XFS_IS_REALTIME_INODE(ip))
@@ -77,6 +86,14 @@ xfs_get_cowextsz_hint(
{
xfs_extlen_t a, b;
+ /*
+ * in unshare path, allocate exactly the number of the blocks to be
+ * unshared so that no new blocks caused the unshare operation remain
+ * in Cow fork after the unshare is done
+ */
+ if (xfs_iflags_test(ip, XFS_IUNSHARE))
+ return 1;
+
a = 0;
if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)
a = ip->i_cowextsize;
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index ab46ffb3ac19..6a8ad68dac1e 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -207,13 +207,13 @@ xfs_new_eof(struct xfs_inode *ip, xfs_fsize_t new_size)
* i_flags helper functions
*/
static inline void
-__xfs_iflags_set(xfs_inode_t *ip, unsigned short flags)
+__xfs_iflags_set(xfs_inode_t *ip, unsigned long flags)
{
ip->i_flags |= flags;
}
static inline void
-xfs_iflags_set(xfs_inode_t *ip, unsigned short flags)
+xfs_iflags_set(xfs_inode_t *ip, unsigned long flags)
{
spin_lock(&ip->i_flags_lock);
__xfs_iflags_set(ip, flags);
@@ -221,7 +221,7 @@ xfs_iflags_set(xfs_inode_t *ip, unsigned short flags)
}
static inline void
-xfs_iflags_clear(xfs_inode_t *ip, unsigned short flags)
+xfs_iflags_clear(xfs_inode_t *ip, unsigned long flags)
{
spin_lock(&ip->i_flags_lock);
ip->i_flags &= ~flags;
@@ -229,13 +229,13 @@ xfs_iflags_clear(xfs_inode_t *ip, unsigned short flags)
}
static inline int
-__xfs_iflags_test(xfs_inode_t *ip, unsigned short flags)
+__xfs_iflags_test(xfs_inode_t *ip, unsigned long flags)
{
return (ip->i_flags & flags);
}
static inline int
-xfs_iflags_test(xfs_inode_t *ip, unsigned short flags)
+xfs_iflags_test(xfs_inode_t *ip, unsigned long flags)
{
int ret;
spin_lock(&ip->i_flags_lock);
@@ -245,7 +245,7 @@ xfs_iflags_test(xfs_inode_t *ip, unsigned short flags)
}
static inline int
-xfs_iflags_test_and_clear(xfs_inode_t *ip, unsigned short flags)
+xfs_iflags_test_and_clear(xfs_inode_t *ip, unsigned long flags)
{
int ret;
@@ -258,7 +258,7 @@ xfs_iflags_test_and_clear(xfs_inode_t *ip, unsigned short flags)
}
static inline int
-xfs_iflags_test_and_set(xfs_inode_t *ip, unsigned short flags)
+xfs_iflags_test_and_set(xfs_inode_t *ip, unsigned long flags)
{
int ret;
@@ -321,25 +321,25 @@ static inline bool xfs_inode_has_large_extent_counts(struct xfs_inode *ip)
/*
* In-core inode flags.
*/
-#define XFS_IRECLAIM (1 << 0) /* started reclaiming this inode */
-#define XFS_ISTALE (1 << 1) /* inode has been staled */
-#define XFS_IRECLAIMABLE (1 << 2) /* inode can be reclaimed */
-#define XFS_INEW (1 << 3) /* inode has just been allocated */
-#define XFS_IPRESERVE_DM_FIELDS (1 << 4) /* has legacy DMAPI fields set */
-#define XFS_ITRUNCATED (1 << 5) /* truncated down so flush-on-close */
-#define XFS_IDIRTY_RELEASE (1 << 6) /* dirty release already seen */
-#define XFS_IFLUSHING (1 << 7) /* inode is being flushed */
+#define XFS_IRECLAIM (1UL << 0) /* started reclaiming this inode */
+#define XFS_ISTALE (1UL << 1) /* inode has been staled */
+#define XFS_IRECLAIMABLE (1UL<< 2) /* inode can be reclaimed */
+#define XFS_INEW (1UL<< 3) /* inode has just been allocated */
+#define XFS_IPRESERVE_DM_FIELDS (1UL << 4) /* has legacy DMAPI fields set */
+#define XFS_ITRUNCATED (1UL << 5) /* truncated down so flush-on-close */
+#define XFS_IDIRTY_RELEASE (1UL << 6) /* dirty release already seen */
+#define XFS_IFLUSHING (1UL << 7) /* inode is being flushed */
#define __XFS_IPINNED_BIT 8 /* wakeup key for zero pin count */
-#define XFS_IPINNED (1 << __XFS_IPINNED_BIT)
-#define XFS_IEOFBLOCKS (1 << 9) /* has the preallocblocks tag set */
-#define XFS_NEED_INACTIVE (1 << 10) /* see XFS_INACTIVATING below */
+#define XFS_IPINNED (1UL << __XFS_IPINNED_BIT)UL
+#define XFS_IEOFBLOCKS (1UL << 9) /* has the preallocblocks tag set */
+#define XFS_NEED_INACTIVE (1UL << 10) /* see XFS_INACTIVATING below */
/*
* If this unlinked inode is in the middle of recovery, don't let drop_inode
* truncate and free the inode. This can happen if we iget the inode during
* log recovery to replay a bmap operation on the inode.
*/
-#define XFS_IRECOVERY (1 << 11)
-#define XFS_ICOWBLOCKS (1 << 12)/* has the cowblocks tag set */
+#define XFS_IRECOVERY (1UL << 11)
+#define XFS_ICOWBLOCKS (1UL << 12)/* has the cowblocks tag set */
/*
* If we need to update on-disk metadata before this IRECLAIMABLE inode can be
@@ -348,10 +348,10 @@ static inline bool xfs_inode_has_large_extent_counts(struct xfs_inode *ip)
* inactivation completes, both flags will be cleared and the inode is a
* plain old IRECLAIMABLE inode.
*/
-#define XFS_INACTIVATING (1 << 13)
+#define XFS_INACTIVATING (1UL << 13)
/* Quotacheck is running but inode has not been added to quota counts. */
-#define XFS_IQUOTAUNCHECKED (1 << 14)
+#define XFS_IQUOTAUNCHECKED (1UL << 14)
/*
* Remap in progress. Callers that wish to update file data while
@@ -359,7 +359,9 @@ static inline bool xfs_inode_has_large_extent_counts(struct xfs_inode *ip)
* the lock in exclusive mode. Relocking the file will block until
* IREMAPPING is cleared.
*/
-#define XFS_IREMAPPING (1U << 15)
+#define XFS_IREMAPPING (1UL << 15)
+
+#define XFS_IUNSHARE (1UL << 16) /* file under unsharing */
/* All inode state flags related to inode reclaim. */
#define XFS_ALL_IRECLAIM_FLAGS (XFS_IRECLAIMABLE | \
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 7da0e8f961d3..7867e4a80b16 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1703,12 +1703,15 @@ xfs_reflink_unshare(
inode_dio_wait(inode);
- if (IS_DAX(inode))
+ if (IS_DAX(inode)) {
error = dax_file_unshare(inode, offset, len,
&xfs_dax_write_iomap_ops);
- else
+ } else {
+ xfs_iflags_set(ip, XFS_IUNSHARE);
error = iomap_file_unshare(inode, offset, len,
&xfs_buffered_write_iomap_ops);
+ xfs_iflags_clear(ip, XFS_IUNSHARE);
+ }
if (error)
goto out;
--
2.39.3 (Apple Git-146)
