diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
| commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
| tree | 01602bae73e1278c3d98dafe1c269049927c58ce /include/uapi | |
| parent | a2746fb16e41b7c8f02aa4d2605ecce97abbebbd (diff) | |
| parent | 3f8d6f2a0797e8c650a47e5c1b5c2601a46f4293 (diff) | |
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/nfs.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h index 654bae3f1a38..5e6296160361 100644 --- a/include/uapi/linux/nfs.h +++ b/include/uapi/linux/nfs.h | |||
| @@ -33,17 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #define NFS_PIPE_DIRNAME "nfs" | 34 | #define NFS_PIPE_DIRNAME "nfs" |
| 35 | 35 | ||
| 36 | /* NFS ioctls */ | ||
| 37 | /* Let's follow btrfs lead on CLONE to avoid messing userspace */ | ||
| 38 | #define NFS_IOC_CLONE _IOW(0x94, 9, int) | ||
| 39 | #define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int) | ||
| 40 | |||
| 41 | struct nfs_ioctl_clone_range_args { | ||
| 42 | __s64 src_fd; | ||
| 43 | __u64 src_off, count; | ||
| 44 | __u64 dst_off; | ||
| 45 | }; | ||
| 46 | |||
| 47 | /* | 36 | /* |
| 48 | * NFS stats. The good thing with these values is that NFSv3 errors are | 37 | * NFS stats. The good thing with these values is that NFSv3 errors are |
| 49 | * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which | 38 | * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which |