diff options
| author | Mikulas Patocka <mikulas@twibright.com> | 2015-07-09 18:05:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-09 20:42:21 +0200 |
| commit | 9abea2d64ce93b6909de7f83a7f681f572369708 (patch) | |
| tree | 6ffa49c9e985f7212ed8edc7271d4969dc3e521a /fs/ocfs2 | |
| parent | Fix firmware loader uevent buffer NULL pointer dereference (diff) | |
| download | linux-9abea2d64ce93b6909de7f83a7f681f572369708.tar.xz linux-9abea2d64ce93b6909de7f83a7f681f572369708.zip | |
ioctl_compat: handle FITRIM
The FITRIM ioctl has the same arguments on 32-bit and 64-bit
architectures, so we can add it to the list of compatible ioctls and
drop it from compat_ioctl method of various filesystems.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Ted Ts'o <tytso@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c index 53e6c40ed4c6..3cb097ccce60 100644 --- a/fs/ocfs2/ioctl.c +++ b/fs/ocfs2/ioctl.c @@ -980,7 +980,6 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg) case OCFS2_IOC_GROUP_EXTEND: case OCFS2_IOC_GROUP_ADD: case OCFS2_IOC_GROUP_ADD64: - case FITRIM: break; case OCFS2_IOC_REFLINK: if (copy_from_user(&args, argp, sizeof(args))) |