diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 12:47:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 12:47:21 -0400 |
| commit | 4157fd85fc794bb7896b65c0cf686aa89d711d57 (patch) | |
| tree | 4ba3ebbea7bcaaa6d7a4ad1c5501c3c4a8d08745 /fs/xfs/xfs_fsops.c | |
| parent | e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 (diff) | |
| parent | 1b17d766463d51904cb242f194a780737e5f73ef (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: prevent deadlock in xfs_qm_shake()
xfs: fix overflow in xfs_growfs_data_private
xfs: fix double unlock in xfs_swap_extents()
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 8379e3bca26c..cbd451bb4848 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
| @@ -160,7 +160,7 @@ xfs_growfs_data_private( | |||
| 160 | nagcount = new + (nb_mod != 0); | 160 | nagcount = new + (nb_mod != 0); |
| 161 | if (nb_mod && nb_mod < XFS_MIN_AG_BLOCKS) { | 161 | if (nb_mod && nb_mod < XFS_MIN_AG_BLOCKS) { |
| 162 | nagcount--; | 162 | nagcount--; |
| 163 | nb = nagcount * mp->m_sb.sb_agblocks; | 163 | nb = (xfs_rfsblock_t)nagcount * mp->m_sb.sb_agblocks; |
| 164 | if (nb < mp->m_sb.sb_dblocks) | 164 | if (nb < mp->m_sb.sb_dblocks) |
| 165 | return XFS_ERROR(EINVAL); | 165 | return XFS_ERROR(EINVAL); |
| 166 | } | 166 | } |