Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56bdf855 authored by Lukas Czerner's avatar Lukas Czerner Committed by Darrick J. Wong
Browse files

xfs: Fix per-inode DAX flag inheritance 



According to the commit that implemented per-inode DAX flag:
commit 58f88ca2 ("xfs: introduce per-inode DAX enablement")
the flag is supposed to act as "inherit flag".

Currently this only works in the situations where parent directory
already has a flag in di_flags set, otherwise inheritance does not
work. This is because setting the XFS_DIFLAG2_DAX flag is done in a
wrong branch designated for di_flags, not di_flags2.

Fix this by moving the code to branch designated for setting di_flags2,
which does test for flags in di_flags2.

Fixes: 58f88ca2 ("xfs: introduce per-inode DAX enablement")
Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent ea7bd56f

fs/xfs/xfs_inode.c

+7 −5
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ xfs_ialloc( 
	case S_IFREG:

	case S_IFDIR:

		if (pip && (pip->i_d.di_flags & XFS_DIFLAG_ANY)) {

			uint64_t	di_flags2 = 0;

			uint		di_flags = 0;



			if (S_ISDIR(mode)) {
@@ -911,20 +910,23 @@ xfs_ialloc( 
				di_flags |= XFS_DIFLAG_NODEFRAG;

			if (pip->i_d.di_flags & XFS_DIFLAG_FILESTREAM)

				di_flags |= XFS_DIFLAG_FILESTREAM;

			if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)

				di_flags2 |= XFS_DIFLAG2_DAX;



			ip->i_d.di_flags |= di_flags;

			ip->i_d.di_flags2 |= di_flags2;

		}

		if (pip &&

		    (pip->i_d.di_flags2 & XFS_DIFLAG2_ANY) &&

		    pip->i_d.di_version == 3 &&

		    ip->i_d.di_version == 3) {

			uint64_t	di_flags2 = 0;



			if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) {

				ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;

				di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;

				ip->i_d.di_cowextsize = pip->i_d.di_cowextsize;

			}

			if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)

				di_flags2 |= XFS_DIFLAG2_DAX;



			ip->i_d.di_flags2 |= di_flags2;

		}

		/* FALLTHROUGH */

	case S_IFLNK: