diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-04-03 23:07:35 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-04-03 23:07:35 +0200 |
| commit | a6cf33bc566c5fe888bfa9cf6448037c90661f67 (patch) | |
| tree | f212498321bbba9ef94bca2702638487b942eb9d /fs/xfs | |
| parent | Merge branch 'xfs-O_TMPFILE-support' into for-next (diff) | |
| parent | xfs: fix directory hash ordering bug (diff) | |
| download | linux-a6cf33bc566c5fe888bfa9cf6448037c90661f67.tar.xz linux-a6cf33bc566c5fe888bfa9cf6448037c90661f67.zip | |
Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_aops.c | 4 | ||||
| -rw-r--r-- | fs/xfs/xfs_da_btree.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 98016b39b8af..75df77d09f75 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 1f5af79c0568..6cc5f6785a77 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); |