40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Mon, 17 May 2010 09:00:00 -0400
|
|
Subject: [PATCH 1/2] ext4: Conditionally define compat ioctl numbers
|
|
|
|
commit 3ad0fa9c3af24b787158aa7d1bca18e401082e33 upstream.
|
|
|
|
It is unnecessary, and in general impossible, to define the compat
|
|
ioctl numbers except when building the filesystem with CONFIG_COMPAT
|
|
defined.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
|
---
|
|
fs/ext4/ext4.h | 2 ++
|
|
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
|
|
index 4a825c1..c6d2ad0 100644
|
|
--- a/fs/ext4/ext4.h
|
|
+++ b/fs/ext4/ext4.h
|
|
@@ -397,6 +397,7 @@ struct ext4_new_group_data {
|
|
#define EXT4_IOC_ALLOC_DA_BLKS _IO('f', 12)
|
|
#define EXT4_IOC_MOVE_EXT _IOWR('f', 15, struct move_extent)
|
|
|
|
+#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
|
|
/*
|
|
* ioctl commands in 32 bit emulation
|
|
*/
|
|
@@ -412,6 +413,7 @@ struct ext4_new_group_data {
|
|
#endif
|
|
#define EXT4_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION
|
|
#define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
|
|
+#endif
|
|
|
|
|
|
/*
|
|
--
|
|
1.7.1
|
|
|