diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 08:37:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 08:37:47 -0800 |
| commit | 6ea9786e76d74350aee6cd9339c6f7cb765ba291 (patch) | |
| tree | a5ac36956a33cd1b2e349800333234876c311dc6 /fs/xfs/xfs_trans_resv.c | |
| parent | 24f971abbda045c24d5d6f2438a7785567d2fde9 (diff) | |
| parent | 2fe8c1c08b3fbd87dd2641c8f032ff6e965d5803 (diff) | |
| download | op-kernel-dev-6ea9786e76d74350aee6cd9339c6f7cb765ba291.zip op-kernel-dev-6ea9786e76d74350aee6cd9339c6f7cb765ba291.tar.gz | |
Merge tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs
Pull second xfs update from Ben Myers:
"There are a couple of patches that I wasn't quite sure about in time
for our initial 3.13 pull request, a bugfix, and an update to add Dave
to MAINTAINERS:
Here we have a performance fix for inode iversion, increased inode
cluster size for v5 superblock filesystems, a fix for error handling
in xfs_bmap_add_attrfork, and a MAINTAINERS update to add Dave"
* tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs:
xfs: open code inc_inode_iversion when logging an inode
xfs: increase inode cluster size for v5 filesystems
xfs: fix unlock in xfs_bmap_add_attrfork
xfs: update maintainers
Diffstat (limited to 'fs/xfs/xfs_trans_resv.c')
| -rw-r--r-- | fs/xfs/xfs_trans_resv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_resv.c b/fs/xfs/xfs_trans_resv.c index d53d9f0..2fd59c0 100644 --- a/fs/xfs/xfs_trans_resv.c +++ b/fs/xfs/xfs_trans_resv.c @@ -385,8 +385,7 @@ xfs_calc_ifree_reservation( xfs_calc_inode_res(mp, 1) + xfs_calc_buf_res(2, mp->m_sb.sb_sectsize) + xfs_calc_buf_res(1, XFS_FSB_TO_B(mp, 1)) + - MAX((__uint16_t)XFS_FSB_TO_B(mp, 1), - XFS_INODE_CLUSTER_SIZE(mp)) + + max_t(uint, XFS_FSB_TO_B(mp, 1), XFS_INODE_CLUSTER_SIZE(mp)) + xfs_calc_buf_res(1, 0) + xfs_calc_buf_res(2 + XFS_IALLOC_BLOCKS(mp) + mp->m_in_maxlevels, 0) + |
