git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
xfs
/
xfs_trans.c
diff --git
a/fs/xfs/xfs_trans.c
b/fs/xfs/xfs_trans.c
index
8188577
..
3db0e22
100644
(file)
--- a/
fs/xfs/xfs_trans.c
+++ b/
fs/xfs/xfs_trans.c
@@
-131,7
+131,7
@@
xfs_trans_alloc(
xfs_mount_t *mp,
uint type)
{
xfs_mount_t *mp,
uint type)
{
-
vfs_check_frozen(XFS_MTOVFS(mp)->vfs_super
, SB_FREEZE_TRANS);
+
fs_check_frozen(XFS_MTOVFS(mp)
, SB_FREEZE_TRANS);
atomic_inc(&mp->m_active_trans);
return (_xfs_trans_alloc(mp, type));
atomic_inc(&mp->m_active_trans);
return (_xfs_trans_alloc(mp, type));
@@
-491,6
+491,9
@@
xfs_trans_apply_sb_deltas(
if (tp->t_frextents_delta != 0) {
INT_MOD(sbp->sb_frextents, ARCH_CONVERT, tp->t_frextents_delta);
}
if (tp->t_frextents_delta != 0) {
INT_MOD(sbp->sb_frextents, ARCH_CONVERT, tp->t_frextents_delta);
}
+ if (tp->t_res_frextents_delta != 0) {
+ INT_MOD(sbp->sb_frextents, ARCH_CONVERT, tp->t_res_frextents_delta);
+ }
if (tp->t_dblocks_delta != 0) {
INT_MOD(sbp->sb_dblocks, ARCH_CONVERT, tp->t_dblocks_delta);
whole = 1;
if (tp->t_dblocks_delta != 0) {
INT_MOD(sbp->sb_dblocks, ARCH_CONVERT, tp->t_dblocks_delta);
whole = 1;