summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorOlaf Weber <olaf@sgi.com>2006-06-09 14:51:11 +1000
committerNathan Scott <nathans@sgi.com>2006-06-09 14:51:11 +1000
commit3f368a0d58cb8cadab298546286f94ca14220f65 (patch)
tree12d93670a1e79a167416f96a147d5ad29e698b9b /fs
parent1d8daf06f67c8920a640eb61b30c3176ecc52405 (diff)
downloadlinux-3.10-3f368a0d58cb8cadab298546286f94ca14220f65.tar.gz
linux-3.10-3f368a0d58cb8cadab298546286f94ca14220f65.tar.bz2
linux-3.10-3f368a0d58cb8cadab298546286f94ca14220f65.zip
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_vnodeops.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 567d14d06d9..2b814f04176 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/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) {