Commit 9336e3a7 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: project id inheritance is a directory only flag 



xfs_set_diflags() allows it to be set on non-directory inodes, and
this flags errors in xfs_repair. Further, inode allocation allows
the same directory-only flag to be inherited to non-directories.
Make sure directory inode flags don't appear on other types of
inodes.

This fixes several xfstests scratch fileystem corruption reports
(e.g. xfs/050) now that xfstests checks scratch filesystems after
test completion.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent e076b0f3

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -769,6 +769,8 @@ xfs_ialloc( 
					di_flags |= XFS_DIFLAG_EXTSZINHERIT;

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

				}

				if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

					di_flags |= XFS_DIFLAG_PROJINHERIT;

			} else if (S_ISREG(mode)) {

				if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT)

					di_flags |= XFS_DIFLAG_REALTIME;
@@ -789,8 +791,6 @@ xfs_ialloc( 
			if ((pip->i_d.di_flags & XFS_DIFLAG_NOSYMLINKS) &&

			    xfs_inherit_nosymlinks)

				di_flags |= XFS_DIFLAG_NOSYMLINKS;

			if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

				di_flags |= XFS_DIFLAG_PROJINHERIT;

			if ((pip->i_d.di_flags & XFS_DIFLAG_NODEFRAG) &&

			    xfs_inherit_nodefrag)

				di_flags |= XFS_DIFLAG_NODEFRAG;

fs/xfs/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -968,8 +968,6 @@ xfs_set_diflags( 
		di_flags |= XFS_DIFLAG_NOATIME;

	if (xflags & XFS_XFLAG_NODUMP)

		di_flags |= XFS_DIFLAG_NODUMP;

	if (xflags & XFS_XFLAG_PROJINHERIT)

		di_flags |= XFS_DIFLAG_PROJINHERIT;

	if (xflags & XFS_XFLAG_NODEFRAG)

		di_flags |= XFS_DIFLAG_NODEFRAG;

	if (xflags & XFS_XFLAG_FILESTREAM)
@@ -981,6 +979,8 @@ xfs_set_diflags( 
			di_flags |= XFS_DIFLAG_NOSYMLINKS;

		if (xflags & XFS_XFLAG_EXTSZINHERIT)

			di_flags |= XFS_DIFLAG_EXTSZINHERIT;

		if (xflags & XFS_XFLAG_PROJINHERIT)

			di_flags |= XFS_DIFLAG_PROJINHERIT;

	} else if (S_ISREG(ip->i_d.di_mode)) {

		if (xflags & XFS_XFLAG_REALTIME)

			di_flags |= XFS_DIFLAG_REALTIME;

CRA Git | Maintained and supported by SUSTech CRA and CCSE