OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
fs
/
nilfs2
/
ioctl.c
diff --git
a/fs/nilfs2/ioctl.c
b/fs/nilfs2/ioctl.c
index
9a20e51
..
aba4381
100644
(file)
--- a/
fs/nilfs2/ioctl.c
+++ b/
fs/nilfs2/ioctl.c
@@
-1369,7
+1369,6
@@
long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case NILFS_IOCTL_SYNC:
case NILFS_IOCTL_RESIZE:
case NILFS_IOCTL_SET_ALLOC_RANGE:
- case FITRIM:
break;
default:
return -ENOIOCTLCMD;