diff options
| author | Linus Torvalds | 2017-04-15 01:53:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-04-15 01:53:45 +0200 |
| commit | 4b31ac485daabc50483598500055d63ce5677cc3 (patch) | |
| tree | 2b2c316b7cc4fbcbde7e9126cb28df04604d30a5 /fs/btrfs/volumes.c | |
| parent | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Btrfs: fix potential use-after-free for cloned bio (diff) | |
| download | kernel-qcow2-linux-4b31ac485daabc50483598500055d63ce5677cc3.tar.gz kernel-qcow2-linux-4b31ac485daabc50483598500055d63ce5677cc3.tar.xz kernel-qcow2-linux-4b31ac485daabc50483598500055d63ce5677cc3.zip | |
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"Dave Sterba collected a few more fixes for the last rc.
These aren't marked for stable, but I'm putting them in with a batch
were testing/sending by hand for this release"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix potential use-after-free for cloned bio
Btrfs: fix segmentation fault when doing dio read
Btrfs: fix invalid dereference in btrfs_retry_endio
btrfs: drop the nossd flag when remounting with -o ssd
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 73d56eef5e60..ab8a66d852f9 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6213,7 +6213,7 @@ int btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, for (dev_nr = 0; dev_nr < total_devs; dev_nr++) { dev = bbio->stripes[dev_nr].dev; if (!dev || !dev->bdev || - (bio_op(bio) == REQ_OP_WRITE && !dev->writeable)) { + (bio_op(first_bio) == REQ_OP_WRITE && !dev->writeable)) { bbio_error(bbio, first_bio, logical); continue; } |