diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index aa7ba00ec082adb2818b18bfd0026374d7412df3..7d5ce496f39f5698096304f6c98a5432a3abc933 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 ca96328628338e77d94f3fd90e36ffe329675108..fb7c0cf72c56a22cc7fa7d767232ebae63498e1a 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__ */