diff options
| author | David Chinner <dgc@sgi.com> | 2005-09-02 16:40:47 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-09-02 16:40:47 +1000 |
| commit | 3bdbfb104e53b367892cc9510e6722346dfb656b (patch) | |
| tree | f4528809d197fc687a73b8152fab8356540455ba /fs | |
| parent | bcec2b7f2bf856bdf2a8780a57fe78417a513682 (diff) | |
| download | op-kernel-dev-3bdbfb104e53b367892cc9510e6722346dfb656b.zip op-kernel-dev-3bdbfb104e53b367892cc9510e6722346dfb656b.tar.gz | |
[XFS] Prevent the incore superblock sb_fdblocks count from leaking when we
are getting ENOSPC errors on writes. When we fail to allocate space for
indirect blocks in xfs_bmapi() make sure we release the direct block
allocation before returning.
SGI-PV: 938502
SGI-Modid: xfs-linux:xfs-kern:22986a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 6f5d283..3e76def 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -4754,10 +4754,20 @@ xfs_bmapi( error = xfs_mod_incore_sb(mp, XFS_SBS_FDBLOCKS, -(alen), rsvd); - if (!error) + if (!error) { error = xfs_mod_incore_sb(mp, XFS_SBS_FDBLOCKS, -(indlen), rsvd); + if (error && rt) { + xfs_mod_incore_sb(ip->i_mount, + XFS_SBS_FREXTENTS, + extsz, rsvd); + } else if (error) { + xfs_mod_incore_sb(ip->i_mount, + XFS_SBS_FDBLOCKS, + alen, rsvd); + } + } if (error) { if (XFS_IS_QUOTA_ON(ip->i_mount)) |
