diff options
| -rw-r--r-- | disk-utils/blockdev.c | 2 | ||||
| -rw-r--r-- | include/blkdev.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c index b0ae37d9e..b20c052f3 100644 --- a/disk-utils/blockdev.c +++ b/disk-utils/blockdev.c @@ -101,7 +101,7 @@ struct bdc bdcms[] = IOCTL_ENTRY(BLKALIGNOFF), .name = "--getalignoff", .argtype = ARG_INT, - .argtype = -1, + .argval = -1, .help = N_("get alignment offset") },{ IOCTL_ENTRY(BLKSECTGET), diff --git a/include/blkdev.h b/include/blkdev.h index 57ef40d49..56a9c1f47 100644 --- a/include/blkdev.h +++ b/include/blkdev.h @@ -34,13 +34,15 @@ #define BLKBSZSET _IOW(0x12,113,size_t) #define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size in bytes (u64 *arg) */ +#endif /* BLKROSET */ + /* block device topology ioctls, introduced in 2.6.32 */ -#define BLKIOMIN _IO(0x1,120) +#ifndef BLKIOMIN +#define BLKIOMIN _IO(0x12,120) #define BLKIOOPT _IO(0x12,121) #define BLKALIGNOFF _IO(0x12,122) #define BLKPBSZGET _IO(0x12,123) - -#endif /* BLKROSET */ +#endif #ifndef HDIO_GETGEO # ifdef __linux__ |