GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.6.36-xfs-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev

Browse source
This commit is contained in:
Alex Elder 2010-09-03 09:02:32 -05:00
commit cb7a93412a
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fs/xfs/linux-2.6/xfs_buf.c
View file

@ -440,12 +440,7 @@ _xfs_buf_find(
ASSERT(btp == bp->b_target); ASSERT(btp == bp->b_target);
if (bp->b_file_offset == range_base && if (bp->b_file_offset == range_base &&
bp->b_buffer_length == range_length) { bp->b_buffer_length == range_length) {
/*
* If we look at something, bring it to the
* front of the list for next time.
*/
atomic_inc(&bp->b_hold); atomic_inc(&bp->b_hold);
list_move(&bp->b_hash_list, &hash->bh_list);
goto found; goto found;
} }
} }
@ -1443,8 +1438,7 @@ xfs_alloc_bufhash(
{ {
unsigned int i; unsigned int i;
btp->bt_hashshift = external ? 3 : 8; /* 8 or 256 buckets */ btp->bt_hashshift = external ? 3 : 12; /* 8 or 4096 buckets */
btp->bt_hashmask = (1 << btp->bt_hashshift) - 1;
btp->bt_hash = kmem_zalloc_large((1 << btp->bt_hashshift) * btp->bt_hash = kmem_zalloc_large((1 << btp->bt_hashshift) *
sizeof(xfs_bufhash_t)); sizeof(xfs_bufhash_t));
for (i = 0; i < (1 << btp->bt_hashshift); i++) { for (i = 0; i < (1 << btp->bt_hashshift); i++) {

1
fs/xfs/linux-2.6/xfs_buf.h
View file

@ -137,7 +137,6 @@ typedef struct xfs_buftarg {
size_t bt_smask; size_t bt_smask;
/* per device buffer hash table */ /* per device buffer hash table */
uint bt_hashmask;
uint bt_hashshift; uint bt_hashshift;
xfs_bufhash_t *bt_hash; xfs_bufhash_t *bt_hash;

13
fs/xfs/xfs_vnodeops.c
View file

@ -2299,15 +2299,22 @@ xfs_alloc_file_space(
e = allocatesize_fsb; e = allocatesize_fsb;
} }
/*
* The transaction reservation is limited to a 32-bit block
* count, hence we need to limit the number of blocks we are
* trying to reserve to avoid an overflow. We can't allocate
* more than @nimaps extents, and an extent is limited on disk
* to MAXEXTLEN (21 bits), so use that to enforce the limit.
*/
resblks = min_t(xfs_fileoff_t, (e - s), (MAXEXTLEN * nimaps));
if (unlikely(rt)) { if (unlikely(rt)) {
resrtextents = qblocks = (uint)(e - s); resrtextents = qblocks = resblks;
resrtextents /= mp->m_sb.sb_rextsize; resrtextents /= mp->m_sb.sb_rextsize;
resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0); resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0);
quota_flag = XFS_QMOPT_RES_RTBLKS; quota_flag = XFS_QMOPT_RES_RTBLKS;
} else { } else {
resrtextents = 0; resrtextents = 0;
resblks = qblocks = \ resblks = qblocks = XFS_DIOSTRAT_SPACE_RES(mp, resblks);
XFS_DIOSTRAT_SPACE_RES(mp, (uint)(e - s));
quota_flag = XFS_QMOPT_RES_REGBLKS; quota_flag = XFS_QMOPT_RES_REGBLKS;
} }