xfs: bugfixes for 3.6-rc4
- fix uninitialised variable in xfs_rtbuf_get() - unlock the AGI buffer when looping in xfs_dialloc - check for possible overflow in xfs_ioc_trim -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJQN7FMAAoJENaLyazVq6ZOrwsQAMB2Cg/t/XeiPFD5QtvFX7Ua 9cS3klSo9p29Xr5oeo54b3mF+5dycS61PQu2zdg4XhU5ZqoWoS6xUIFxzo3yWiVi nC/BbgMQTgkfEQs+2ulmXRgP8A2DdakSDmvAZDQNURZQwH4zykU0tPKD9V009TMW SaIprIWQqhRrsd9prrv364FgKv3/vyuFL1Agho304o3ynk+2SLDzm3eqdTaXTD9Z 9OGP5Hs5Mh9CZmr46MIpRnoaHppqNRZh7EbDyMFL8kMN8F2yOdJk5MgA1m7gPJ5Z ADfnv3laxEp04hhD5lazePYJwZlg/KB77Y4YXD5hmTSznIxcQNlfRcMV9ju4FGgr Nb5SgA/6iBk5dkZyuyIdqCzj1Mt6SimpIWb3+/vcS8+VaqQUsyoufccO0zrgeoIA /O1PtCe//haFENlD+hMc9QrQSISsaR/YYUv0yz4YcsxKsdmyYpbHdTyFhVjnkKoS BtA0ZOgWYebgEzr7J1ijW085CrDvAc9jsPujOWmZlBJWcfo1rtVfqhXWll0ms5cr ZRoWqLDqoOhjlUDqwMN4dk6ENxG4QbSl6AWXXVXrUvtvaNzoi0MBNX3HPt/RVmF5 rGKFvLuIxBHAfD1xYCqtCfP9yzeQzDy1SPdASForEZOyM+RVUnOf9i+1nhbsu/97 AhiW4lozQetWzx+RQwU+ =+FuN -----END PGP SIGNATURE----- Merge tag 'for-linus-v3.6-rc4' of git://oss.sgi.com/xfs/xfs Pull xfs bugfixes from Ben Myers: - fix uninitialised variable in xfs_rtbuf_get() - unlock the AGI buffer when looping in xfs_dialloc - check for possible overflow in xfs_ioc_trim * tag 'for-linus-v3.6-rc4' of git://oss.sgi.com/xfs/xfs: xfs: check for possible overflow in xfs_ioc_trim xfs: unlock the AGI buffer when looping in xfs_dialloc xfs: fix uninitialised variable in xfs_rtbuf_get()
This commit is contained in:
commit
e1d33a5c63
|
@ -179,12 +179,14 @@ xfs_ioc_trim(
|
|||
* used by the fstrim application. In the end it really doesn't
|
||||
* matter as trimming blocks is an advisory interface.
|
||||
*/
|
||||
if (range.start >= XFS_FSB_TO_B(mp, mp->m_sb.sb_dblocks) ||
|
||||
range.minlen > XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp)))
|
||||
return -XFS_ERROR(EINVAL);
|
||||
|
||||
start = BTOBB(range.start);
|
||||
end = start + BTOBBT(range.len) - 1;
|
||||
minlen = BTOBB(max_t(u64, granularity, range.minlen));
|
||||
|
||||
if (XFS_BB_TO_FSB(mp, start) >= mp->m_sb.sb_dblocks)
|
||||
return -XFS_ERROR(EINVAL);
|
||||
if (end > XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks) - 1)
|
||||
end = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks)- 1;
|
||||
|
||||
|
|
|
@ -962,23 +962,22 @@ xfs_dialloc(
|
|||
if (!pag->pagi_freecount && !okalloc)
|
||||
goto nextag;
|
||||
|
||||
/*
|
||||
* Then read in the AGI buffer and recheck with the AGI buffer
|
||||
* lock held.
|
||||
*/
|
||||
error = xfs_ialloc_read_agi(mp, tp, agno, &agbp);
|
||||
if (error)
|
||||
goto out_error;
|
||||
|
||||
/*
|
||||
* Once the AGI has been read in we have to recheck
|
||||
* pagi_freecount with the AGI buffer lock held.
|
||||
*/
|
||||
if (pag->pagi_freecount) {
|
||||
xfs_perag_put(pag);
|
||||
goto out_alloc;
|
||||
}
|
||||
|
||||
if (!okalloc) {
|
||||
xfs_trans_brelse(tp, agbp);
|
||||
goto nextag;
|
||||
}
|
||||
if (!okalloc)
|
||||
goto nextag_relse_buffer;
|
||||
|
||||
|
||||
error = xfs_ialloc_ag_alloc(tp, agbp, &ialloced);
|
||||
if (error) {
|
||||
|
@ -1007,6 +1006,8 @@ xfs_dialloc(
|
|||
return 0;
|
||||
}
|
||||
|
||||
nextag_relse_buffer:
|
||||
xfs_trans_brelse(tp, agbp);
|
||||
nextag:
|
||||
xfs_perag_put(pag);
|
||||
if (++agno == mp->m_sb.sb_agcount)
|
||||
|
|
|
@ -857,7 +857,7 @@ xfs_rtbuf_get(
|
|||
xfs_buf_t *bp; /* block buffer, result */
|
||||
xfs_inode_t *ip; /* bitmap or summary inode */
|
||||
xfs_bmbt_irec_t map;
|
||||
int nmap;
|
||||
int nmap = 1;
|
||||
int error; /* error value */
|
||||
|
||||
ip = issum ? mp->m_rsumip : mp->m_rbmip;
|
||||
|
|
Loading…
Reference in a new issue