[PATCH C&C] gdth: remove GDTIOCTL_OSVERS

[PATCH C&C] gdth: remove GDTIOCTL_OSVERS

[Alexey Dobriyan]

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 drivers/scsi/gdth.c       |   12 ------------
 drivers/scsi/gdth_ioctl.h |    8 --------
 2 files changed, 20 deletions(-)

diff -uprN linux-vanilla/drivers/scsi/gdth.c linux-gdth/drivers/scsi/gdth.c
--- linux-vanilla/drivers/scsi/gdth.c	2005-08-08 02:16:47.000000000 +0400
+++ linux-gdth/drivers/scsi/gdth.c	2005-08-08 02:19:59.000000000 +0400
@@ -5411,18 +5411,6 @@ static int gdth_ioctl(struct inode *inod
                 return -EFAULT;
         break;
       }
-      
-      case GDTIOCTL_OSVERS:
-      { 
-        gdth_ioctl_osvers osv; 
-
-        osv.version = (unchar)(LINUX_VERSION_CODE >> 16);
-        osv.subversion = (unchar)(LINUX_VERSION_CODE >> 8);
-        osv.revision = (ushort)(LINUX_VERSION_CODE & 0xff);
-        if (copy_to_user(argp, &osv, sizeof(gdth_ioctl_osvers)))
-                return -EFAULT;
-        break;
-      }
 
       case GDTIOCTL_CTRTYPE:
       { 
diff -uprN linux-vanilla/drivers/scsi/gdth_ioctl.h linux-gdth/drivers/scsi/gdth_ioctl.h
--- linux-vanilla/drivers/scsi/gdth_ioctl.h	2005-08-08 02:16:47.000000000 +0400
+++ linux-gdth/drivers/scsi/gdth_ioctl.h	2005-08-08 02:20:19.000000000 +0400
@@ -10,7 +10,6 @@
 #define GDTIOCTL_GENERAL    (GDTIOCTL_MASK | 0) /* general IOCTL */
 #define GDTIOCTL_DRVERS     (GDTIOCTL_MASK | 1) /* get driver version */
 #define GDTIOCTL_CTRTYPE    (GDTIOCTL_MASK | 2) /* get controller type */
-#define GDTIOCTL_OSVERS     (GDTIOCTL_MASK | 3) /* get OS version */
 #define GDTIOCTL_HDRLIST    (GDTIOCTL_MASK | 4) /* get host drive list */
 #define GDTIOCTL_CTRCNT     (GDTIOCTL_MASK | 5) /* get controller count */
 #define GDTIOCTL_LOCKDRV    (GDTIOCTL_MASK | 6) /* lock host drive */
@@ -296,13 +295,6 @@ typedef struct {
     unchar channel;                             /* channel */
 } gdth_ioctl_lockchn;
 
-/* GDTIOCTL_OSVERS */
-typedef struct {
-    unchar version;                             /* OS version */
-    unchar subversion;                          /* OS subversion */
-    ushort revision;                            /* revision */
-} gdth_ioctl_osvers;
-
 /* GDTIOCTL_CTRTYPE */
 typedef struct {
     ushort ionode;                              /* controller number */

Re: [PATCH C&C] gdth: remove GDTIOCTL_OSVERS

[Adrian Bunk]

On Mon, Aug 08, 2005 at 02:28:29AM +0400, Alexey Dobriyan wrote:

>...
> --- linux-vanilla/drivers/scsi/gdth.c	2005-08-08 02:16:47.000000000 +0400
> +++ linux-gdth/drivers/scsi/gdth.c	2005-08-08 02:19:59.000000000 +0400
> @@ -5411,18 +5411,6 @@ static int gdth_ioctl(struct inode *inod
>                  return -EFAULT;
>          break;
>        }
> -      
> -      case GDTIOCTL_OSVERS:
> -      { 
> -        gdth_ioctl_osvers osv; 
> -
> -        osv.version = (unchar)(LINUX_VERSION_CODE >> 16);
> -        osv.subversion = (unchar)(LINUX_VERSION_CODE >> 8);
> -        osv.revision = (ushort)(LINUX_VERSION_CODE & 0xff);
> -        if (copy_to_user(argp, &osv, sizeof(gdth_ioctl_osvers)))
> -                return -EFAULT;
> -        break;
> -      }
>...

Not that I'd like this, but you know that this is a userspace-visible 
change?

cu
Adrian

-- 

       "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

Re: [PATCH C&C] gdth: remove GDTIOCTL_OSVERS

[Alexey Dobriyan]

On Mon, Aug 08, 2005 at 03:40:27AM +0200, Adrian Bunk wrote:
> On Mon, Aug 08, 2005 at 02:28:29AM +0400, Alexey Dobriyan wrote:
> > -      case GDTIOCTL_OSVERS:
> > -      { 
> > -        gdth_ioctl_osvers osv; 
> > -
> > -        osv.version = (unchar)(LINUX_VERSION_CODE >> 16);
> > -        osv.subversion = (unchar)(LINUX_VERSION_CODE >> 8);
> > -        osv.revision = (ushort)(LINUX_VERSION_CODE & 0xff);
> > -        if (copy_to_user(argp, &osv, sizeof(gdth_ioctl_osvers)))
> > -                return -EFAULT;
> > -        break;
> > -      }

> Not that I'd like this, but you know that this is a userspace-visible 
> change?

I know. I also know about uname(2), /proc/sys/kernel/osrelease,
/proc/version, uname(1).

OK, I'll schedule it for removal and give a #warning. How much time
will be enough with everyone? For the record: IMO, it should be zero in
this particular case.