Commit 3f368a0d authored Jun 09, 2006 by Olaf Weber Committed by Nathan Scott Jun 09, 2006

[XFS] Originally the ATTR_DMI flag also had the functionality of the


ATTR_NOLOCK flag, but this was split off some time ago, as ATTR_DMI needed
to be used separately.	Two asserts were added to guard correctness of the
code during the transition.  These are no longer required.

SGI-PV: 952145
SGI-Modid: xfs-linux-melb:xfs-kern:209633a

Signed-off-by: Olaf Weber <olaf@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>

parent 1d8daf06

fs/xfs/xfs_vnodeops.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -347,7 +347,6 @@ xfs_setattr(
		*/
		tp = NULL;
		lock_flags = XFS_ILOCK_EXCL;
		ASSERT(flags & ATTR_NOLOCK ? flags & ATTR_DMI : 1);
		if (flags & ATTR_NOLOCK)
		need_iolock = 0;
		if (!(mask & XFS_AT_SIZE)) {
		@@ -4308,7 +4307,6 @@ xfs_free_file_space(
		return error;
		}

		ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1);
		if (attr_flags & ATTR_NOLOCK)
		need_iolock = 0;
		if (need_iolock) {