diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-11-13 09:38:46 +0100 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@primarydata.com> | 2015-11-23 21:52:28 -0500 |
| commit | 3a2e176905b1a8d1b51cbfda719058f5ce893efd (patch) | |
| tree | 875d275cf9c8d211702aca9838b8af86268d23a2 | |
| parent | nfs: pass on count for CLONE operations (diff) | |
| download | linux-dev-3a2e176905b1a8d1b51cbfda719058f5ce893efd.tar.xz linux-dev-3a2e176905b1a8d1b51cbfda719058f5ce893efd.zip | |
nfs: offer native ioctls even if CONFIG_COMPAT is set
Without this for example 64-bit binaries on typical amd64 distributions
would not be able to use ioctls on NFS. For now this only affects clones.
Additionally ->compat_ioctl is defined even for non-compat builds, so
get rid of the pointless ifdef.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/nfs4file.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 4aa571956cd6..e45f686a5a60 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -347,9 +347,6 @@ const struct file_operations nfs4_file_operations = { #endif /* CONFIG_NFS_V4_2 */ .check_flags = nfs_check_flags, .setlease = simple_nosetlease, -#ifdef CONFIG_COMPAT .unlocked_ioctl = nfs4_ioctl, -#else .compat_ioctl = nfs4_ioctl, -#endif /* CONFIG_COMPAT */ }; |