diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-12-31 11:51:02 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-31 11:51:02 -0500 |
| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 (patch) | |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 /drivers/md/md.c | |
| parent | 8d30726912cb39c3a3ebde06214d54861f8fdde2 (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index b07fed398fd7..16d84e091e2d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -7765,7 +7765,7 @@ void md_check_recovery(struct mddev *mddev) | |||
| 7765 | if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) | 7765 | if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery)) |
| 7766 | return; | 7766 | return; |
| 7767 | if ( ! ( | 7767 | if ( ! ( |
| 7768 | (mddev->flags & ~ (1<<MD_CHANGE_PENDING)) || | 7768 | (mddev->flags & MD_UPDATE_SB_FLAGS & ~ (1<<MD_CHANGE_PENDING)) || |
| 7769 | test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || | 7769 | test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) || |
| 7770 | test_bit(MD_RECOVERY_DONE, &mddev->recovery) || | 7770 | test_bit(MD_RECOVERY_DONE, &mddev->recovery) || |
| 7771 | (mddev->external == 0 && mddev->safemode == 1) || | 7771 | (mddev->external == 0 && mddev->safemode == 1) || |