Skip to contentSkip to conversation

xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk

PATCH Applied Nathan Chancellor 4 participants 7 messages Dec 9, 2019 – Dec 20, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk

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")
---
 drivers/block/xen-blkfront.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/xen-blkfront.c +2 -2
index a74d03913822..c02be06c5299 100644
@@ -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;
Signature · 1 line
2.24.0
#1 lore raw

drivers/block/xen-blkfront.c static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

Quoted 30 lines · Nathan Chancellor

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")
---
 drivers/block/xen-blkfront.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/xen-blkfront.c +0 -0
index a74d03913822..c02be06c5299 100644
@@ -1113,8 +1113,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

While you're here, would you please also removing the single space before the labels in this function?

In vim:

/^ [a-zA-Z]

turns up 5 labels with this.

Quoted 17 lines
drivers/block/xen-blkfront.c +2 -3
        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.24.0

--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191209201444.33243-1-natechancellor%40gmail.com.

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 36 lines · Nick Desaulniers

drivers/block/xen-blkfront.c static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

Quoted 30 lines · Nathan Chancellor

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")
---
 drivers/block/xen-blkfront.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/xen-blkfront.c +0 -0
index a74d03913822..c02be06c5299 100644
@@ -1113,8 +1113,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

While you're here, would you please also removing the single space before the labels in this function?

Quoted 5 lines

In vim:

/^ [a-zA-Z]

turns up 5 labels with this.

That should probably be a separate patch since there are only two labels in the function I am touching here. I'll whip up a v2 if the maintainers want it though or I'll just draft a separate patch when I am done addressing all of the misleading indentation warnings.

Thanks for the reply!
Nathan

maintainer
#3 lore raw
In reply to Nick Desaulniers
Quoted 27 lines · Nick Desaulniers
Quoted 25 lines · Nathan Chancellor

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")
---
  drivers/block/xen-blkfront.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 8 lines

drivers/block/xen-blkfront.c static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

Quoted 5 lines
drivers/block/xen-blkfront.c +0 -0
index a74d03913822..c02be06c5299 100644
@@ -1113,8 +1113,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,

While you're here, would you please also removing the single space before the labels in this function?

AFAIK those are intended to be there.

Having labels indented by a space makes diff not believe those are function declarations. So a patching a function with a label won't show the label, but the function in the diff block header.

Juergen

maintainer Reviewed-by on v1 1/1
#4 lore raw
In reply to Nathan Chancellor
Quoted 14 lines · Nathan Chancellor

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.

Quoted 6 lines

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")

Juergen

#5 lore raw
Quoted 15 lines · Jürgen Groß
Quoted 14 lines · Nathan Chancellor

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.

Quoted 8 lines
Quoted 6 lines

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")

Thanks.

maintainer Applied
#6 lore raw
In reply to Nathan Chancellor
Quoted 14 lines · Nathan Chancellor

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.

Quoted 6 lines

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")

Pushed to xen/tip.git for-linus-5.5b

Juergen