mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
NFS: Fix an 'unused variable' complaint when #ifndef CONFIG_NFS_V4_2
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
a340abcf41
commit
275058a218
1 changed files with 11 additions and 2 deletions
|
@ -298,6 +298,17 @@ static long nfs42_ioctl_clone_range(struct file *dst_file, void __user *argp)
|
||||||
|
|
||||||
return nfs42_ioctl_clone(dst_file, args.src_fd, args.src_off, args.dst_off, args.count);
|
return nfs42_ioctl_clone(dst_file, args.src_fd, args.src_off, args.dst_off, args.count);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
static long nfs42_ioctl_clone(struct file *dst_file, unsigned long srcfd,
|
||||||
|
u64 src_off, u64 dst_off, u64 count)
|
||||||
|
{
|
||||||
|
return -ENOTTY;
|
||||||
|
}
|
||||||
|
|
||||||
|
static long nfs42_ioctl_clone_range(struct file *dst_file, void __user *argp)
|
||||||
|
{
|
||||||
|
return -ENOTTY;
|
||||||
|
}
|
||||||
#endif /* CONFIG_NFS_V4_2 */
|
#endif /* CONFIG_NFS_V4_2 */
|
||||||
|
|
||||||
long nfs4_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
long nfs4_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
|
@ -305,12 +316,10 @@ long nfs4_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
void __user *argp = (void __user *)arg;
|
void __user *argp = (void __user *)arg;
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
#ifdef CONFIG_NFS_V4_2
|
|
||||||
case NFS_IOC_CLONE:
|
case NFS_IOC_CLONE:
|
||||||
return nfs42_ioctl_clone(file, arg, 0, 0, 0);
|
return nfs42_ioctl_clone(file, arg, 0, 0, 0);
|
||||||
case NFS_IOC_CLONE_RANGE:
|
case NFS_IOC_CLONE_RANGE:
|
||||||
return nfs42_ioctl_clone_range(file, argp);
|
return nfs42_ioctl_clone_range(file, argp);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return -ENOTTY;
|
return -ENOTTY;
|
||||||
|
|
Loading…
Reference in a new issue