diff --git a/[refs] b/[refs] index 23a03f8aaa54..eb67051d1d3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d67d1218344009970ba0deb7eb15a3984518ddd0 +refs/heads/master: a56e69c28ad0782a99f3f196e93d57ba5a7e2324 diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c index c052c9f0f3a1..bb424de9953b 100644 --- a/trunk/fs/ext4/ioctl.c +++ b/trunk/fs/ext4/ioctl.c @@ -427,6 +427,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return err; } case EXT4_IOC_MOVE_EXT: + case FITRIM: break; default: return -ENOIOCTLCMD;