diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-03 01:52:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-03 01:52:50 +0200 |
| commit | b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a (patch) | |
| tree | d796a497a6dd2d51e67f4f8e0cc73a31992cf910 /fs/xfs/xfs_inode.c | |
| parent | Move dtc and libfdt sources from arch/powerpc/boot to scripts/dtc (diff) | |
| parent | xfs: fix getbmap vs mmap deadlock (diff) | |
| download | linux-b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a.tar.xz linux-b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix getbmap vs mmap deadlock
xfs: a couple getbmap cleanups
xfs: add more checks to superblock validation
xfs_file_last_byte() needs to acquire ilock
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index e7ae08d1df48..123b20c8cbf2 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1258,8 +1258,10 @@ xfs_file_last_byte( * necessary. */ if (ip->i_df.if_flags & XFS_IFEXTENTS) { + xfs_ilock(ip, XFS_ILOCK_SHARED); error = xfs_bmap_last_offset(NULL, ip, &last_block, XFS_DATA_FORK); + xfs_iunlock(ip, XFS_ILOCK_SHARED); if (error) { last_block = 0; } |