mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
This commit is contained in:
commit
a6cf33bc56
2 changed files with 3 additions and 3 deletions
|
@ -659,10 +659,10 @@ xfs_check_page_type(
|
|||
if (type == XFS_IO_UNWRITTEN)
|
||||
return true;
|
||||
} else if (buffer_delay(bh)) {
|
||||
if (type == XFS_IO_DELALLOC);
|
||||
if (type == XFS_IO_DELALLOC)
|
||||
return true;
|
||||
} else if (buffer_dirty(bh) && buffer_mapped(bh)) {
|
||||
if (type == XFS_IO_OVERWRITE);
|
||||
if (type == XFS_IO_OVERWRITE)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1296,7 +1296,7 @@ xfs_da3_fixhashpath(
|
|||
node = blk->bp->b_addr;
|
||||
dp->d_ops->node_hdr_from_disk(&nodehdr, node);
|
||||
btree = dp->d_ops->node_tree_p(node);
|
||||
if (be32_to_cpu(btree->hashval) == lasthash)
|
||||
if (be32_to_cpu(btree[blk->index].hashval) == lasthash)
|
||||
break;
|
||||
blk->hashval = lasthash;
|
||||
btree[blk->index].hashval = cpu_to_be32(lasthash);
|
||||
|
|
Loading…
Reference in a new issue