diff options
| author | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
| commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
| tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/xfs_vnodeops.c | |
| parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
| parent | f9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 9d376be0ea38..a06bd62504fc 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
| @@ -267,7 +267,7 @@ xfs_setattr( | |||
| 267 | if (code) { | 267 | if (code) { |
| 268 | ASSERT(tp == NULL); | 268 | ASSERT(tp == NULL); |
| 269 | lock_flags &= ~XFS_ILOCK_EXCL; | 269 | lock_flags &= ~XFS_ILOCK_EXCL; |
| 270 | ASSERT(lock_flags == XFS_IOLOCK_EXCL); | 270 | ASSERT(lock_flags == XFS_IOLOCK_EXCL || !need_iolock); |
| 271 | goto error_return; | 271 | goto error_return; |
| 272 | } | 272 | } |
| 273 | tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE); | 273 | tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE); |