diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 12:12:43 -0500 |
| commit | d180ec5d348e3a51836d723c182374483012c981 (patch) | |
| tree | 252bcf36f7f6e329d94092a3238a79d7f2e1e2e2 /fs/xfs/linux-2.6/xfs_ioctl32.c | |
| parent | 53365383c4667aba55385cd1858582c19a7a8a36 (diff) | |
| parent | 0b1b213fcf3a8486ada99a2bab84ab8c6f51b264 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: event tracing support
xfs: change the xfs_iext_insert / xfs_iext_remove
xfs: cleanup bmap extent state macros
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index eafcc7c18706..be1527b1670c 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include "xfs_attr.h" | 46 | #include "xfs_attr.h" |
| 47 | #include "xfs_ioctl.h" | 47 | #include "xfs_ioctl.h" |
| 48 | #include "xfs_ioctl32.h" | 48 | #include "xfs_ioctl32.h" |
| 49 | #include "xfs_trace.h" | ||
| 49 | 50 | ||
| 50 | #define _NATIVE_IOC(cmd, type) \ | 51 | #define _NATIVE_IOC(cmd, type) \ |
| 51 | _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type)) | 52 | _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(type)) |