diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-24 10:03:04 +0000 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-24 10:03:04 +0000 |
| commit | 8ca05c60de49c3bb523a435abc216b6b6eeb1067 (patch) | |
| tree | 75fac74607dee53a7cc11fdfe1c73162eb526455 | |
| parent | 044399b2cb6ad2d7f63cfca945268853d7443a4d (diff) | |
[GFS2] Update ioctl() numbering to use official numbers.
This patch adds us into the official ioctl-number.txt registry
and updates GFS2 accordingly.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -rw-r--r-- | Documentation/ioctl-number.txt | 1 | ||||
| -rw-r--r-- | include/linux/gfs2_ioctl.h | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index aa7ba00ec08..7d5ce496f39 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -126,6 +126,7 @@ Code Seq# Include File Comments 'e' 00-1F linux/video_encoder.h conflict! 'e' 00-1F net/irda/irtty.h conflict! 'f' 00-1F linux/ext2_fs.h +'g' 00-1F linux/gfs2_ioctl.h 'h' 00-7F Charon filesystem <mailto:zapman@interlan.net> 'i' 00-3F linux/i2o.h diff --git a/include/linux/gfs2_ioctl.h b/include/linux/gfs2_ioctl.h index ca963286283..fb7c0cf72c5 100644 --- a/include/linux/gfs2_ioctl.h +++ b/include/linux/gfs2_ioctl.h @@ -10,12 +10,8 @@ #ifndef __GFS2_IOCTL_DOT_H__ #define __GFS2_IOCTL_DOT_H__ -#define _GFS2C_(x) (('G' << 16) | ('2' << 8) | (x)) - -/* Ioctls implemented */ - -#define GFS2_IOCTL_SETFLAGS _GFS2C_(3) -#define GFS2_IOCTL_GETFLAGS _GFS2C_(4) +#define GFS2_IOCTL_SETFLAGS _IOW('g', 3, long) +#define GFS2_IOCTL_GETFLAGS _IOR('g', 4, long) #endif /* ___GFS2_IOCTL_DOT_H__ */ |