xfs: allow inodes to have the realtime and reflink flags

Now that we can share blocks between realtime files, allow this
combination.

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

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 68b9abc6a146895ded60740eb89c941a40138396..1cc2622015071ae912dd26a40d4354197b17473e 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -742,7 +742,8 @@ xfs_dinode_verify(
                return __this_address;
 
        /* don't let reflink and realtime mix */
-       if ((flags2 & XFS_DIFLAG2_REFLINK) && (flags & XFS_DIFLAG_REALTIME))
+       if ((flags2 & XFS_DIFLAG2_REFLINK) && (flags & XFS_DIFLAG_REALTIME) &&
+           !xfs_has_rtreflink(mp))
                return __this_address;
 
        /* COW extent size hint validation */

diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c
index 4aaf422d366ff2612e4ecfc75ad8c47827e263f3..e51a87beb896afa3fd2442432c277db22abaf7d9 100644 (file)
--- a/fs/xfs/scrub/inode.c
+++ b/fs/xfs/scrub/inode.c
@@ -360,8 +360,9 @@ xchk_inode_flags2(
        if ((flags2 & XFS_DIFLAG2_REFLINK) && !S_ISREG(mode))
                goto bad;
 
-       /* realtime and reflink make no sense, currently */
-       if ((flags & XFS_DIFLAG_REALTIME) && (flags2 & XFS_DIFLAG2_REFLINK))
+       /* realtime and reflink don't always go together */
+       if ((flags & XFS_DIFLAG_REALTIME) && (flags2 & XFS_DIFLAG2_REFLINK) &&
+           !xfs_has_rtreflink(mp))
                goto bad;
 
        /* no bigtime iflag without the bigtime feature */

diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c
index 9c14a26d78a3264148d2ce9d5fda022478e299a6..2ad2d7c2c7cca2c299b00f00ddd5bff039af9871 100644 (file)
--- a/fs/xfs/scrub/inode_repair.c
+++ b/fs/xfs/scrub/inode_repair.c
@@ -564,8 +564,6 @@ xrep_dinode_flags(
                flags2 |= XFS_DIFLAG2_REFLINK;
        else
                flags2 &= ~(XFS_DIFLAG2_REFLINK | XFS_DIFLAG2_COWEXTSIZE);
-       if (flags & XFS_DIFLAG_REALTIME)
-               flags2 &= ~XFS_DIFLAG2_REFLINK;
        if (!xfs_has_bigtime(mp))
                flags2 &= ~XFS_DIFLAG2_BIGTIME;
        if (!xfs_has_large_extent_counts(mp))
@@ -1765,10 +1763,6 @@ xrep_inode_flags(
        /* DAX only applies to files and dirs. */
        if (!(S_ISREG(mode) || S_ISDIR(mode)))
                sc->ip->i_diflags2 &= ~XFS_DIFLAG2_DAX;
-
-       /* No reflink files on the realtime device. */
-       if (sc->ip->i_diflags & XFS_DIFLAG_REALTIME)
-               sc->ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK;
 }
 
 /*

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 30420b09115e005fdba860c178f4bdd2a6c60440..1e843de4d54bcbd1b621a783c3ba1f9f873134a8 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -541,10 +541,6 @@ xfs_ioctl_setattr_xflags(
                if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 ||
                    xfs_extlen_to_rtxmod(mp, ip->i_extsize))
                        return -EINVAL;
-
-               /* Clear reflink if we are actually able to set the rt flag. */
-               if (xfs_is_reflink_inode(ip))
-                       ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK;
        }
 
        /* diflags2 only valid for v3 inodes. */