diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:29:04 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:29:04 +1100 |
| commit | c53473be45afbbba215fda75bedbb089272e45e0 (patch) | |
| tree | 0628c38bfed18968087e12117e847d70176817a7 /fs/xfs/xfs_bmap_util.c | |
| parent | 9deed09554f9ce17c8785533a7d6dbcf51471659 (diff) | |
| parent | bf85e0998ae8bafc1e0863d914df3be2b1bc372a (diff) | |
Merge branch 'xfs-rt-fixes-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 45ec9e40150c..07ef29b9b464 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -202,10 +202,12 @@ xfs_bmap_rtalloc( ralen = MAXEXTLEN / mp->m_sb.sb_rextsize; /* - * Lock out other modifications to the RT bitmap inode. + * Lock out modifications to both the RT bitmap and summary inodes */ xfs_ilock(mp->m_rbmip, XFS_ILOCK_EXCL); xfs_trans_ijoin(ap->tp, mp->m_rbmip, XFS_ILOCK_EXCL); + xfs_ilock(mp->m_rsumip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(ap->tp, mp->m_rsumip, XFS_ILOCK_EXCL); /* * If it's an allocation to an empty file at offset 0, |