diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:08:54 -0700 |
commit | 7603ef03a22a33d36d3c75d7c1aca1f957671ad3 (patch) | |
tree | ff6fb5e582d02612f213deac6d7532d153c6099f /fs/xfs/xfs_bmap_btree.c | |
parent | 1904187a694713b80d74186fe058377b067cc195 (diff) | |
parent | fd40261354802b0f05f6f67121235aa002e87069 (diff) |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
xfs: fix small mismerge in xfs_vn_mknod
xfs: fix warnings with CONFIG_XFS_QUOTA disabled
xfs: fix freeing memory in xfs_getbmap()
xfs: use generic Posix ACL code
xfs: remove SYNC_BDFLUSH
xfs: remove SYNC_IOWAIT
xfs: split xfs_sync_inodes
xfs: use generic inode iterator in xfs_qm_dqrele_all_inodes
xfs: introduce a per-ag inode iterator
xfs: remove unused parameter from xfs_reclaim_inodes
xfs: factor out inode validation for sync
xfs: split inode flushing from xfs_sync_inodes_ag
xfs: split inode data writeback from xfs_sync_inodes_ag
xfs: kill xfs_qmops
xfs: validate quota log items during log recovery
xfs: update max log size
xfs: prevent deadlock in xfs_qm_shake()
xfs: fix overflow in xfs_growfs_data_private
xfs: fix double unlock in xfs_swap_extents()
xfs: fix getbmap vs mmap deadlock
...
Diffstat (limited to 'fs/xfs/xfs_bmap_btree.c')
-rw-r--r-- | fs/xfs/xfs_bmap_btree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c index 0760d352586..5c1ade06578 100644 --- a/fs/xfs/xfs_bmap_btree.c +++ b/fs/xfs/xfs_bmap_btree.c @@ -590,7 +590,7 @@ xfs_bmbt_alloc_block( cur->bc_private.b.allocated++; cur->bc_private.b.ip->i_d.di_nblocks++; xfs_trans_log_inode(args.tp, cur->bc_private.b.ip, XFS_ILOG_CORE); - XFS_TRANS_MOD_DQUOT_BYINO(args.mp, args.tp, cur->bc_private.b.ip, + xfs_trans_mod_dquot_byino(args.tp, cur->bc_private.b.ip, XFS_TRANS_DQ_BCOUNT, 1L); new->l = cpu_to_be64(args.fsbno); @@ -618,7 +618,7 @@ xfs_bmbt_free_block( ip->i_d.di_nblocks--; xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); - XFS_TRANS_MOD_DQUOT_BYINO(mp, tp, ip, XFS_TRANS_DQ_BCOUNT, -1L); + xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L); xfs_trans_binval(tp, bp); return 0; } |