Skip to contentSkip to conversation

linux/hdsmart.h: fix goofups

PATCH In review Bartlomiej Zolnierkiewicz 4 participants 10 messages Feb 17, 2008 – Feb 19, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux/hdsmart.h: fix goofups

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/hdsmart.h +2 -2
Index: b/include/linux/hdsmart.h
===================================================================
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */
#1 lore raw
Quoted 23 lines · Bartlomiej Zolnierkiewicz

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/include/linux/hdsmart.h
===================================================================

include/linux/hdsmart.h +1 -1
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2

include/linux/hdsmart.h typedef struct ata_smart_selftestlog_s { · line 126

Quoted 7 lines
include/linux/hdsmart.h +1 -1
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

include/linux/Kbuild:header-y += hdsmart.h

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

rday
--

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
Have classroom, will lecture.

http://crashcourse.ca Waterloo, Ontario, CANADA
========================================================================

#2 lore raw
Quoted 37 lines · Robert P. J. Day
Quoted 23 lines · Bartlomiej Zolnierkiewicz

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/include/linux/hdsmart.h
===================================================================

include/linux/hdsmart.h +1 -1
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2

include/linux/hdsmart.h typedef struct ata_smart_selftestlog_s { · line 126

Quoted 7 lines
include/linux/hdsmart.h +1 -1
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

Quoted 5 lines

include/linux/Kbuild:header-y += hdsmart.h

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

We don't want new (accidental etc.) kernel users of this header.

How's about this version?

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] linux/hdsmart.h: fix goofups (take 2)

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

Also update include/linux/Kbuild to reflect the fact that hdsmart.h uses __KERNEL__ ifdefs now.

---
 include/linux/Kbuild    |    2 +-
 include/linux/hdsmart.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/Kbuild +1 -1
Index: b/include/linux/Kbuild
===================================================================
@@ -70,7 +70,6 @@ header-y += fuse.h
 header-y += genetlink.h
 header-y += gen_stats.h
 header-y += gigaset_dev.h
-header-y += hdsmart.h
 header-y += hysdn_if.h
 header-y += i2o-dev.h
 header-y += i8k.h
@@ -211,6 +210,7 @@ unifdef-y += hayesesp.h
 unifdef-y += hdlcdrv.h
 unifdef-y += hdlc.h
 unifdef-y += hdreg.h
+unifdef-y += hdsmart.h
 unifdef-y += hiddev.h
 unifdef-y += hpet.h
 unifdef-y += i2c.h
include/linux/hdsmart.h +2 -2
Index: b/include/linux/hdsmart.h
===================================================================
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */
#3 lore raw
Quoted 38 lines · Bartlomiej Zolnierkiewicz
Quoted 37 lines · Robert P. J. Day
Quoted 23 lines · Bartlomiej Zolnierkiewicz

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/include/linux/hdsmart.h
===================================================================

include/linux/hdsmart.h +1 -1
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2

include/linux/hdsmart.h typedef struct ata_smart_selftestlog_s { · line 126

Quoted 7 lines
include/linux/hdsmart.h +1 -1
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

Quoted 8 lines
Quoted 5 lines

include/linux/Kbuild:header-y += hdsmart.h

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

We don't want new (accidental etc.) kernel users of this header.
...

Why can't we simply remove it?

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#4 lore raw
Quoted 41 lines · Adrian Bunk
Quoted 40 lines · Bartlomiej Zolnierkiewicz
Quoted 39 lines · Robert P. J. Day
Quoted 23 lines · Bartlomiej Zolnierkiewicz

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/include/linux/hdsmart.h
===================================================================

include/linux/hdsmart.h +1 -1
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2

include/linux/hdsmart.h typedef struct ata_smart_selftestlog_s { · line 126

Quoted 7 lines
include/linux/hdsmart.h +1 -1
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

include/linux/Kbuild:header-y += hdsmart.h

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

We don't want new (accidental etc.) kernel users of this header.
...

Why can't we simply remove it?

If it is safe w.r.t. userspace then please do it.

[ I don't know and I couldn't get an answer on LKML so... ]

Thanks,
Bart

#5 lore raw
Quoted 49 lines · Bartlomiej Zolnierkiewicz
Quoted 48 lines · Adrian Bunk
Quoted 46 lines · Bartlomiej Zolnierkiewicz
Quoted 37 lines · Robert P. J. Day
Quoted 23 lines · Bartlomiej Zolnierkiewicz

Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c ("<linux/hdsmart.h> is not used by kernel code").

---
 include/linux/hdsmart.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/include/linux/hdsmart.h
===================================================================

include/linux/hdsmart.h +1 -1
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
 
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN		0
 #define SHORT_SELF_TEST			1
 #define EXTEND_SELF_TEST		2

include/linux/hdsmart.h typedef struct ata_smart_selftestlog_s { · line 126

Quoted 7 lines
include/linux/hdsmart.h +1 -1
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
 	unsigned char			resevered[2];
 	unsigned char			chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 
 #endif	/* _LINUX_HDSMART_H */

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

Quoted 5 lines

include/linux/Kbuild:header-y += hdsmart.h

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

We don't want new (accidental etc.) kernel users of this header.
...

Quoted 8 lines
Quoted 1 line

Why can't we simply remove it?

If it is safe w.r.t. userspace then please do it.

[ I don't know and I couldn't get an answer on LKML so... ]

Thanks,
Bart

i'll leave that decision in someone else's hands. have fun.

rday
--

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
Have classroom, will lecture.

http://crashcourse.ca Waterloo, Ontario, CANADA
========================================================================

#8 lore raw
In reply to Robert P. J. Day
Quoted 9 lines · Robert P. J. Day

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

include/linux/Kbuild:header-y += hdsmart.h

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

Umm... if the kernel isn't using it, why are we bothering to export it to userspace at all? Or is the kernel using something *else* that should be going to userspace instead?

#9 lore raw
Quoted 8 lines · On Mon, 18 Feb 2008, [email protected] wrote:
Quoted 6 lines · Robert P. J. Day

if that header file isn't used by any kernel code, why bother having a check for __KERNEL__ in the first place? it's being exported to userspace unchecked:

include/linux/Kbuild:header-y += hdsmart.h

Quoted 7 lines
Quoted 3 lines

so why not just toss that check entirely? otherwise, you're going to get a header file exported to userspace that has a superfluous __KERNEL__ test in it.

Umm... if the kernel isn't using it, why are we bothering to export it to userspace at all? Or is the kernel using something *else* that should be going to userspace instead?

beats me, i just observe 'em, i don't make those judgment calls. :-)

rday
--

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
Have classroom, will lecture.

http://crashcourse.ca Waterloo, Ontario, CANADA
========================================================================

#6 lore raw

PATCH 1/1 remove include/linux/hdsmart.h

In reply to Bartlomiej Zolnierkiewicz
Quoted 7 lines · Bartlomiej Zolnierkiewicz
Quoted 1 line · Adrian Bunk

Why can't we simply remove it?

If it is safe w.r.t. userspace then please do it.

[ I don't know and I couldn't get an answer on LKML so... ]

The purpose of the kernel userapce headers is to contain the interfaces between the kernel and userspace.

If nothing in the kernel uses it there's not much value in keeping it.

Removal patch below.

Quoted 2 lines

Thanks,
Bart

cu
Adrian

<-- snip -->

include/linux/hdsmart.h is not used by the kernel and should therefore be removed.

 include/linux/Kbuild    |    1 
 include/linux/hdsmart.h |  126 ----------------------------------------
 2 files changed, 127 deletions(-)

a93fe7221c62dbe655e646321a0f1f276f4d05f2 diff --git a/include/linux/Kbuild b/include/linux/Kbuild index aada32f..0743c5e 100644

include/linux/Kbuild +0 -1
@@ -210,7 +210,6 @@ unifdef-y += hayesesp.h
 unifdef-y += hdlcdrv.h
 unifdef-y += hdlc.h
 unifdef-y += hdreg.h
-unifdef-y += hdsmart.h
 unifdef-y += hiddev.h
 unifdef-y += hpet.h
 unifdef-y += i2c.h
include/linux/hdsmart.h deleted +0 -126

126 lines not on this page · raw message

#7 lore raw

Re: [2.6 patch] remove include/linux/hdsmart.h

Quoted 23 lines · Adrian Bunk
Quoted 7 lines · Bartlomiej Zolnierkiewicz
Quoted 1 line · Adrian Bunk

Why can't we simply remove it?

If it is safe w.r.t. userspace then please do it.

[ I don't know and I couldn't get an answer on LKML so... ]

The purpose of the kernel userapce headers is to contain the interfaces between the kernel and userspace.

If nothing in the kernel uses it there's not much value in keeping it.

Removal patch below.

Quoted 2 lines

Thanks,
Bart

cu
Adrian

Quoted 7 lines

<-- snip -->

include/linux/hdsmart.h is not used by the kernel and should therefore be removed.

applied