| From 7d61abb89868c066c168d7ebe04da707d95c43ab Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Mon, 9 Dec 2019 13:14:44 -0700 |
| Subject: [PATCH] xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 589b72894f53124a39d1bb3c0cecaf9dcabac417 upstream. |
| |
| Clang warns: |
| |
| ../drivers/block/xen-blkfront.c:1117:4: warning: misleading indentation; |
| statement is not part of the previous 'if' [-Wmisleading-indentation] |
| nr_parts = PARTS_PER_DISK; |
| ^ |
| ../drivers/block/xen-blkfront.c:1115:3: note: previous statement is here |
| if (err) |
| ^ |
| |
| This is because there is a space at the beginning of this line; remove |
| it so that the indentation is consistent according to the Linux kernel |
| coding style and clang no longer warns. |
| |
| While we are here, the previous line has some trailing whitespace; clean |
| that up as well. |
| |
| Fixes: c80a420995e7 ("xen-blkfront: handle Xen major numbers other than XENVBD") |
| Link: https://github.com/ClangBuiltLinux/linux/issues/791 |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Reviewed-by: Juergen Gross <jgross@suse.com> |
| Acked-by: Roger Pau Monné <roger.pau@citrix.com> |
| Signed-off-by: Juergen Gross <jgross@suse.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c |
| index a74d03913822..c02be06c5299 100644 |
| --- a/drivers/block/xen-blkfront.c |
| +++ b/drivers/block/xen-blkfront.c |
| @@ -1113,8 +1113,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, |
| if (!VDEV_IS_EXTENDED(info->vdevice)) { |
| err = xen_translate_vdev(info->vdevice, &minor, &offset); |
| if (err) |
| - return err; |
| - nr_parts = PARTS_PER_DISK; |
| + return err; |
| + nr_parts = PARTS_PER_DISK; |
| } else { |
| minor = BLKIF_MINOR_EXT(info->vdevice); |
| nr_parts = PARTS_PER_EXT_DISK; |
| -- |
| 2.7.4 |
| |
