diff options
author | Dave Chinner <david@fromorbit.com> | 2014-04-04 01:07:35 +0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-04-04 01:07:35 +0400 |
commit | a6cf33bc566c5fe888bfa9cf6448037c90661f67 (patch) | |
tree | f212498321bbba9ef94bca2702638487b942eb9d /fs/xfs/xfs_aops.c | |
parent | fe986f9d88ab8079c91669b7f175081f15491a80 (diff) | |
parent | c88547a8119e3b581318ab65e9b72f27f23e641d (diff) | |
download | linux-a6cf33bc566c5fe888bfa9cf6448037c90661f67.tar.xz |
Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.c')
-rw-r--r-- | fs/xfs/xfs_aops.c | 4 |
1 files changed, 2 insertions, 2 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; } |