[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>
git-mirror · Jan 24, 2006 · 8ca05c6 · 8ca05c6
1 parent 044399b
commit 8ca05c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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__ */