diff --git a/[refs] b/[refs] index 0ba8faca0322..be4343d936ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe0754f0e5c0f070bf82b6e7e5e8fa5a188163fc +refs/heads/master: d349404ff14758dc9a2d3df032073ed795085860 diff --git a/trunk/fs/xfs/xfs_fsops.c b/trunk/fs/xfs/xfs_fsops.c index 5d5e9b34dd02..381ebda4f7bc 100644 --- a/trunk/fs/xfs/xfs_fsops.c +++ b/trunk/fs/xfs/xfs_fsops.c @@ -552,11 +552,8 @@ xfs_reserve_blocks( mp->m_resblks += free; mp->m_resblks_avail += free; fdblks_delta = -free; - mp->m_sb.sb_fdblocks = XFS_ALLOC_SET_ASIDE(mp); } else { fdblks_delta = -delta; - mp->m_sb.sb_fdblocks = - lcounter + XFS_ALLOC_SET_ASIDE(mp); mp->m_resblks = request; mp->m_resblks_avail += delta; } @@ -587,7 +584,6 @@ xfs_reserve_blocks( if (error == ENOSPC) goto retry; } - return 0; }