diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/compat_ioctl.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 996cdc5abb85..5d19acfa7c6c 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | #include <linux/gigaset_dev.h> | 66 | #include <linux/gigaset_dev.h> |
| 67 | 67 | ||
| 68 | #ifdef CONFIG_BLOCK | 68 | #ifdef CONFIG_BLOCK |
| 69 | #include <linux/loop.h> | ||
| 70 | #include <linux/cdrom.h> | 69 | #include <linux/cdrom.h> |
| 71 | #include <linux/fd.h> | 70 | #include <linux/fd.h> |
| 72 | #include <scsi/scsi.h> | 71 | #include <scsi/scsi.h> |
| @@ -954,8 +953,6 @@ COMPATIBLE_IOCTL(MTIOCTOP) | |||
| 954 | /* Socket level stuff */ | 953 | /* Socket level stuff */ |
| 955 | COMPATIBLE_IOCTL(FIOQSIZE) | 954 | COMPATIBLE_IOCTL(FIOQSIZE) |
| 956 | #ifdef CONFIG_BLOCK | 955 | #ifdef CONFIG_BLOCK |
| 957 | /* loop */ | ||
| 958 | IGNORE_IOCTL(LOOP_CLR_FD) | ||
| 959 | /* md calls this on random blockdevs */ | 956 | /* md calls this on random blockdevs */ |
| 960 | IGNORE_IOCTL(RAID_VERSION) | 957 | IGNORE_IOCTL(RAID_VERSION) |
| 961 | /* qemu/qemu-img might call these two on plain files for probing */ | 958 | /* qemu/qemu-img might call these two on plain files for probing */ |