diff options
| -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 aa7ba00ec082..7d5ce496f39f 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt | |||
| @@ -126,6 +126,7 @@ Code Seq# Include File Comments | |||
| 126 | 'e' 00-1F linux/video_encoder.h conflict! | 126 | 'e' 00-1F linux/video_encoder.h conflict! |
| 127 | 'e' 00-1F net/irda/irtty.h conflict! | 127 | 'e' 00-1F net/irda/irtty.h conflict! |
| 128 | 'f' 00-1F linux/ext2_fs.h | 128 | 'f' 00-1F linux/ext2_fs.h |
| 129 | 'g' 00-1F linux/gfs2_ioctl.h | ||
| 129 | 'h' 00-7F Charon filesystem | 130 | 'h' 00-7F Charon filesystem |
| 130 | <mailto:zapman@interlan.net> | 131 | <mailto:zapman@interlan.net> |
| 131 | 'i' 00-3F linux/i2o.h | 132 | 'i' 00-3F linux/i2o.h |
diff --git a/include/linux/gfs2_ioctl.h b/include/linux/gfs2_ioctl.h index ca9632862833..fb7c0cf72c56 100644 --- a/include/linux/gfs2_ioctl.h +++ b/include/linux/gfs2_ioctl.h | |||
| @@ -10,12 +10,8 @@ | |||
| 10 | #ifndef __GFS2_IOCTL_DOT_H__ | 10 | #ifndef __GFS2_IOCTL_DOT_H__ |
| 11 | #define __GFS2_IOCTL_DOT_H__ | 11 | #define __GFS2_IOCTL_DOT_H__ |
| 12 | 12 | ||
| 13 | #define _GFS2C_(x) (('G' << 16) | ('2' << 8) | (x)) | 13 | #define GFS2_IOCTL_SETFLAGS _IOW('g', 3, long) |
| 14 | 14 | #define GFS2_IOCTL_GETFLAGS _IOR('g', 4, long) | |
| 15 | /* Ioctls implemented */ | ||
| 16 | |||
| 17 | #define GFS2_IOCTL_SETFLAGS _GFS2C_(3) | ||
| 18 | #define GFS2_IOCTL_GETFLAGS _GFS2C_(4) | ||
| 19 | 15 | ||
| 20 | #endif /* ___GFS2_IOCTL_DOT_H__ */ | 16 | #endif /* ___GFS2_IOCTL_DOT_H__ */ |
| 21 | 17 | ||