diff options
| author |   Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-06-08 20:05:50 +0800 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-06-30 13:20:02 -0700 |
| commit | 65f5333875d7bbfc13436e224a181d10a80d1ada (patch) | |
| tree | d4ff1a5b334708119d78d1411104d65741e7a527 | |
| parent | btrfs: qgroup: allow user to clear the limitation on qgroup (diff) | |
| download | linux-dev-65f5333875d7bbfc13436e224a181d10a80d1ada.tar.xz linux-dev-65f5333875d7bbfc13436e224a181d10a80d1ada.zip | |
btrfs: cleanup noused initialization of dev in btrfs_end_bio()
It is introduced by:
c404e0dc2c843b154f9a36c3aec10d0a715d88eb
Btrfs: fix use-after-free in the finishing procedure of the device replace
But seems no relationship with that bug, this patch revirt these
code block for cleanup.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
| -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 83966996aacb..d4cd4059bded 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5715,7 +5715,6 @@ static inline void btrfs_end_bbio(struct btrfs_bio *bbio, struct bio *bio, int e static void btrfs_end_bio(struct bio *bio, int err) { struct btrfs_bio *bbio = bio->bi_private; - struct btrfs_device *dev = bbio->stripes[0].dev; int is_orig_bio = 0; if (err) { @@ -5723,6 +5722,7 @@ static void btrfs_end_bio(struct bio *bio, int err) if (err == -EIO || err == -EREMOTEIO) { unsigned int stripe_index = btrfs_io_bio(bio)->stripe_index; + struct btrfs_device *dev; BUG_ON(stripe_index >= bbio->num_stripes); dev = bbio->stripes[stripe_index].dev; |