diff options
author | Olaf Weber <olaf@sgi.com> | 2006-06-09 00:51:11 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 00:51:11 -0400 |
commit | 3f368a0d58cb8cadab298546286f94ca14220f65 (patch) | |
tree | 12d93670a1e79a167416f96a147d5ad29e698b9b | |
parent | 1d8daf06f67c8920a640eb61b30c3176ecc52405 (diff) |
[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>
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 567d14d06d95..2b814f04176d 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -347,7 +347,6 @@ xfs_setattr( | |||
347 | */ | 347 | */ |
348 | tp = NULL; | 348 | tp = NULL; |
349 | lock_flags = XFS_ILOCK_EXCL; | 349 | lock_flags = XFS_ILOCK_EXCL; |
350 | ASSERT(flags & ATTR_NOLOCK ? flags & ATTR_DMI : 1); | ||
351 | if (flags & ATTR_NOLOCK) | 350 | if (flags & ATTR_NOLOCK) |
352 | need_iolock = 0; | 351 | need_iolock = 0; |
353 | if (!(mask & XFS_AT_SIZE)) { | 352 | if (!(mask & XFS_AT_SIZE)) { |
@@ -4308,7 +4307,6 @@ xfs_free_file_space( | |||
4308 | return error; | 4307 | return error; |
4309 | } | 4308 | } |
4310 | 4309 | ||
4311 | ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1); | ||
4312 | if (attr_flags & ATTR_NOLOCK) | 4310 | if (attr_flags & ATTR_NOLOCK) |
4313 | need_iolock = 0; | 4311 | need_iolock = 0; |
4314 | if (need_iolock) { | 4312 | if (need_iolock) { |