From 13ec96dc2270ff9181fca9c2773c97b533055cfe Mon Sep 17 00:00:00 2001
From: Olaf Weber <olaf@sgi.com>
Date: Fri, 9 Jun 2006 14:51:11 +1000
Subject: [PATCH] --- yaml --- r: 28410 b: refs/heads/master c:
 3f368a0d58cb8cadab298546286f94ca14220f65 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/xfs/xfs_vnodeops.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5591f3c49f0a..8c0d66abd269 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d8daf06f67c8920a640eb61b30c3176ecc52405
+refs/heads/master: 3f368a0d58cb8cadab298546286f94ca14220f65
diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
index 567d14d06d95..2b814f04176d 100644
--- a/trunk/fs/xfs/xfs_vnodeops.c
+++ b/trunk/fs/xfs/xfs_vnodeops.c
@@ -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) {