diff options
| author | Chris Mason <clm@fb.com> | 2016-01-11 09:08:37 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-11 09:08:37 -0500 |
| commit | b28cf57246d5b797ba725bb033110c247f2c301f (patch) | |
| tree | 33dbe2cfcafa6e7f5b3047a669e454739839f3c7 /fs/btrfs/scrub.c | |
| parent | a3058101c17d2825f34a0ab5c37d93ead0f4d9dc (diff) | |
| parent | a7ca42256d9fad572fb7f2c471514d7d3572b1db (diff) | |
Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index dbfbfb3b86b5..0c981ebe2acb 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
| @@ -1514,8 +1514,6 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, | |||
| 1514 | 1514 | ||
| 1515 | if (sblock->no_io_error_seen) | 1515 | if (sblock->no_io_error_seen) |
| 1516 | scrub_recheck_block_checksum(sblock); | 1516 | scrub_recheck_block_checksum(sblock); |
| 1517 | |||
| 1518 | return; | ||
| 1519 | } | 1517 | } |
| 1520 | 1518 | ||
| 1521 | static inline int scrub_check_fsid(u8 fsid[], | 1519 | static inline int scrub_check_fsid(u8 fsid[], |