From 94b21fb551eeaf6a0999c6134f6532d8d96e4934 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 24 Jan 2006 10:03:04 +0000 Subject: [PATCH] --- yaml --- r: 38594 b: refs/heads/master c: 8ca05c60de49c3bb523a435abc216b6b6eeb1067 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl-number.txt | 1 + trunk/include/linux/gfs2_ioctl.h | 8 ++------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 66457d9f70ca..336e3e12b0ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 044399b2cb6ad2d7f63cfca945268853d7443a4d +refs/heads/master: 8ca05c60de49c3bb523a435abc216b6b6eeb1067 diff --git a/trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt index aa7ba00ec082..7d5ce496f39f 100644 --- a/trunk/Documentation/ioctl-number.txt +++ b/trunk/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 'i' 00-3F linux/i2o.h diff --git a/trunk/include/linux/gfs2_ioctl.h b/trunk/include/linux/gfs2_ioctl.h index ca9632862833..fb7c0cf72c56 100644 --- a/trunk/include/linux/gfs2_ioctl.h +++ b/trunk/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__ */