diff options
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
-rw-r--r-- | fs/xfs/xfs_iomap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index fb3cf1191419..a2c3200a099f 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
@@ -196,14 +196,14 @@ xfs_iomap( | |||
196 | break; | 196 | break; |
197 | case BMAPI_WRITE: | 197 | case BMAPI_WRITE: |
198 | xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, ip, offset, count); | 198 | xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, ip, offset, count); |
199 | lockmode = XFS_ILOCK_EXCL|XFS_EXTSIZE_WR; | 199 | lockmode = XFS_ILOCK_EXCL; |
200 | if (flags & BMAPI_IGNSTATE) | 200 | if (flags & BMAPI_IGNSTATE) |
201 | bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE; | 201 | bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE; |
202 | xfs_ilock(ip, lockmode); | 202 | xfs_ilock(ip, lockmode); |
203 | break; | 203 | break; |
204 | case BMAPI_ALLOCATE: | 204 | case BMAPI_ALLOCATE: |
205 | xfs_iomap_enter_trace(XFS_IOMAP_ALLOC_ENTER, ip, offset, count); | 205 | xfs_iomap_enter_trace(XFS_IOMAP_ALLOC_ENTER, ip, offset, count); |
206 | lockmode = XFS_ILOCK_SHARED|XFS_EXTSIZE_RD; | 206 | lockmode = XFS_ILOCK_SHARED; |
207 | bmapi_flags = XFS_BMAPI_ENTIRE; | 207 | bmapi_flags = XFS_BMAPI_ENTIRE; |
208 | 208 | ||
209 | /* Attempt non-blocking lock */ | 209 | /* Attempt non-blocking lock */ |
@@ -624,7 +624,7 @@ xfs_iomap_write_delay( | |||
624 | int prealloc, fsynced = 0; | 624 | int prealloc, fsynced = 0; |
625 | int error; | 625 | int error; |
626 | 626 | ||
627 | ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE) != 0); | 627 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); |
628 | 628 | ||
629 | /* | 629 | /* |
630 | * Make sure that the dquots are there. This doesn't hold | 630 | * Make sure that the dquots are there. This doesn't hold |