leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jejb-scsi' into misc

Browse Source
This commit is contained in:
James Bottomley
2016-01-07 15:51:13 -08:00
parent a2746fb16e 3f8d6f2a07
commit abaee091a1
822 changed files with 11545 additions and 5928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/uapi/linux/nfs.h
View File

@@ -33,17 +33,6 @@
#define NFS_PIPE_DIRNAME "nfs"
/* NFS ioctls */
/* Let's follow btrfs lead on CLONE to avoid messing userspace */
#define NFS_IOC_CLONE _IOW(0x94, 9, int)
#define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int)
struct nfs_ioctl_clone_range_args {
__s64 src_fd;
__u64 src_off, count;
__u64 dst_off;
};
/*
* NFS stats. The good thing with these values is that NFSv3 errors are
* a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which