diff options
| author | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
|---|---|---|
| committer | Avik Sil <avik.sil@linaro.org> | 2011-03-31 11:06:38 +0000 |
| commit | ebb688e3183bd5891312bdb8f4e2f520d70b36b6 (patch) | |
| tree | c30d1abefaccc8cd1baa4944aae3348668e13bde /fs/ioctl.c | |
| parent | 8061f3a885ec3538bf405ff3957c205b1ab2aae4 (diff) | |
| parent | b2afcd30fff4c24290a63a2497de301864d9726d (diff) | |
Merge remote branch 'lttng/2.6.38-lttng-0.247'
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'fs/ioctl.c')
| -rw-r--r-- | fs/ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c index 1eebeb72b20..a1fecf33b11 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -15,9 +15,12 @@ #include <linux/writeback.h> #include <linux/buffer_head.h> #include <linux/falloc.h> +#include <trace/fs.h> #include <asm/ioctls.h> +DEFINE_TRACE(fs_ioctl); + /* So that the fiemap access checks can't overflow on 32 bit machines. */ #define FIEMAP_MAX_EXTENTS (UINT_MAX / sizeof(struct fiemap_extent)) @@ -616,6 +619,8 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, unsigned long, arg) if (!filp) goto out; + trace_fs_ioctl(fd, cmd, arg); + error = security_file_ioctl(filp, cmd, arg); if (error) goto out_fput; |