diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 65 |
1 files changed, 62 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 0f8f1384eb36..4636b7f86f1f 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
@@ -47,8 +47,52 @@ | |||
47 | #include "xfs_vnode.h" | 47 | #include "xfs_vnode.h" |
48 | #include "xfs_dfrag.h" | 48 | #include "xfs_dfrag.h" |
49 | 49 | ||
50 | #define _NATIVE_IOC(cmd, type) \ | ||
51 | _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type)) | ||
52 | |||
50 | #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) | 53 | #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) |
51 | #define BROKEN_X86_ALIGNMENT | 54 | #define BROKEN_X86_ALIGNMENT |
55 | /* on ia32 l_start is on a 32-bit boundary */ | ||
56 | typedef struct xfs_flock64_32 { | ||
57 | __s16 l_type; | ||
58 | __s16 l_whence; | ||
59 | __s64 l_start __attribute__((packed)); | ||
60 | /* len == 0 means until end of file */ | ||
61 | __s64 l_len __attribute__((packed)); | ||
62 | __s32 l_sysid; | ||
63 | __u32 l_pid; | ||
64 | __s32 l_pad[4]; /* reserve area */ | ||
65 | } xfs_flock64_32_t; | ||
66 | |||
67 | #define XFS_IOC_ALLOCSP_32 _IOW ('X', 10, struct xfs_flock64_32) | ||
68 | #define XFS_IOC_FREESP_32 _IOW ('X', 11, struct xfs_flock64_32) | ||
69 | #define XFS_IOC_ALLOCSP64_32 _IOW ('X', 36, struct xfs_flock64_32) | ||
70 | #define XFS_IOC_FREESP64_32 _IOW ('X', 37, struct xfs_flock64_32) | ||
71 | #define XFS_IOC_RESVSP_32 _IOW ('X', 40, struct xfs_flock64_32) | ||
72 | #define XFS_IOC_UNRESVSP_32 _IOW ('X', 41, struct xfs_flock64_32) | ||
73 | #define XFS_IOC_RESVSP64_32 _IOW ('X', 42, struct xfs_flock64_32) | ||
74 | #define XFS_IOC_UNRESVSP64_32 _IOW ('X', 43, struct xfs_flock64_32) | ||
75 | |||
76 | /* just account for different alignment */ | ||
77 | STATIC unsigned long | ||
78 | xfs_ioctl32_flock( | ||
79 | unsigned long arg) | ||
80 | { | ||
81 | xfs_flock64_32_t __user *p32 = (void __user *)arg; | ||
82 | xfs_flock64_t __user *p = compat_alloc_user_space(sizeof(*p)); | ||
83 | |||
84 | if (copy_in_user(&p->l_type, &p32->l_type, sizeof(s16)) || | ||
85 | copy_in_user(&p->l_whence, &p32->l_whence, sizeof(s16)) || | ||
86 | copy_in_user(&p->l_start, &p32->l_start, sizeof(s64)) || | ||
87 | copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) || | ||
88 | copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) || | ||
89 | copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) || | ||
90 | copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32))) | ||
91 | return -EFAULT; | ||
92 | |||
93 | return (unsigned long)p; | ||
94 | } | ||
95 | |||
52 | #else | 96 | #else |
53 | 97 | ||
54 | typedef struct xfs_fsop_bulkreq32 { | 98 | typedef struct xfs_fsop_bulkreq32 { |
@@ -103,7 +147,6 @@ __linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg) | |||
103 | /* not handled | 147 | /* not handled |
104 | case XFS_IOC_FD_TO_HANDLE: | 148 | case XFS_IOC_FD_TO_HANDLE: |
105 | case XFS_IOC_PATH_TO_HANDLE: | 149 | case XFS_IOC_PATH_TO_HANDLE: |
106 | case XFS_IOC_PATH_TO_HANDLE: | ||
107 | case XFS_IOC_PATH_TO_FSHANDLE: | 150 | case XFS_IOC_PATH_TO_FSHANDLE: |
108 | case XFS_IOC_OPEN_BY_HANDLE: | 151 | case XFS_IOC_OPEN_BY_HANDLE: |
109 | case XFS_IOC_FSSETDM_BY_HANDLE: | 152 | case XFS_IOC_FSSETDM_BY_HANDLE: |
@@ -124,8 +167,21 @@ __linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg) | |||
124 | case XFS_IOC_ERROR_CLEARALL: | 167 | case XFS_IOC_ERROR_CLEARALL: |
125 | break; | 168 | break; |
126 | 169 | ||
127 | #ifndef BROKEN_X86_ALIGNMENT | 170 | #ifdef BROKEN_X86_ALIGNMENT |
128 | /* xfs_flock_t and xfs_bstat_t have wrong u32 vs u64 alignment */ | 171 | /* xfs_flock_t has wrong u32 vs u64 alignment */ |
172 | case XFS_IOC_ALLOCSP_32: | ||
173 | case XFS_IOC_FREESP_32: | ||
174 | case XFS_IOC_ALLOCSP64_32: | ||
175 | case XFS_IOC_FREESP64_32: | ||
176 | case XFS_IOC_RESVSP_32: | ||
177 | case XFS_IOC_UNRESVSP_32: | ||
178 | case XFS_IOC_RESVSP64_32: | ||
179 | case XFS_IOC_UNRESVSP64_32: | ||
180 | arg = xfs_ioctl32_flock(arg); | ||
181 | cmd = _NATIVE_IOC(cmd, struct xfs_flock64); | ||
182 | break; | ||
183 | |||
184 | #else /* These are handled fine if no alignment issues */ | ||
129 | case XFS_IOC_ALLOCSP: | 185 | case XFS_IOC_ALLOCSP: |
130 | case XFS_IOC_FREESP: | 186 | case XFS_IOC_FREESP: |
131 | case XFS_IOC_RESVSP: | 187 | case XFS_IOC_RESVSP: |
@@ -134,6 +190,9 @@ __linvfs_compat_ioctl(int mode, struct file *f, unsigned cmd, unsigned long arg) | |||
134 | case XFS_IOC_FREESP64: | 190 | case XFS_IOC_FREESP64: |
135 | case XFS_IOC_RESVSP64: | 191 | case XFS_IOC_RESVSP64: |
136 | case XFS_IOC_UNRESVSP64: | 192 | case XFS_IOC_UNRESVSP64: |
193 | break; | ||
194 | |||
195 | /* xfs_bstat_t still has wrong u32 vs u64 alignment */ | ||
137 | case XFS_IOC_SWAPEXT: | 196 | case XFS_IOC_SWAPEXT: |
138 | break; | 197 | break; |
139 | 198 | ||