forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'xfs-misc-fixes-3.17-1' into for-next

Browse source
This commit is contained in:
Dave Chinner 2014-08-04 13:54:14 +10:00
commit 4d7eece2c0
25 changed files with 166 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fs/xfs/xfs_mount.c
View file

@ -176,13 +176,9 @@ xfs_sb_validate_fsb_count(
ASSERT(PAGE_SHIFT >= sbp->sb_blocklog);
ASSERT(sbp->sb_blocklog >= BBSHIFT);
#if XFS_BIG_BLKNOS /* Limited by ULONG_MAX of page cache index */
/* Limited by ULONG_MAX of page cache index */
if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX)
return -EFBIG;
#else /* Limited by UINT_MAX of sectors */
if (nblocks << (sbp->sb_blocklog - BBSHIFT) > UINT_MAX)
return -EFBIG;
#endif
return 0;
}
@ -253,9 +249,9 @@ xfs_initialize_perag(
mp->m_flags &= ~XFS_MOUNT_32BITINODES;
if (mp->m_flags & XFS_MOUNT_32BITINODES)
index = xfs_set_inode32(mp);
index = xfs_set_inode32(mp, agcount);
else
index = xfs_set_inode64(mp);
index = xfs_set_inode64(mp, agcount);
if (maxagi)
*maxagi = index;