summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-04-04 08:07:35 +1100
committerDave Chinner <david@fromorbit.com>2014-04-04 08:07:35 +1100
commita6cf33bc566c5fe888bfa9cf6448037c90661f67 (patch)
treef212498321bbba9ef94bca2702638487b942eb9d /fs/xfs
parentfe986f9d88ab8079c91669b7f175081f15491a80 (diff)
parentc88547a8119e3b581318ab65e9b72f27f23e641d (diff)
Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_aops.c4
-rw-r--r--fs/xfs/xfs_da_btree.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 98016b39b8a..75df77d09f7 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -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;
}
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 1f5af79c056..6cc5f6785a7 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -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);