diff options
author | Peng Tao <tao.peng@primarydata.com> | 2015-09-25 14:24:37 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-10-15 16:08:18 -0400 |
commit | 2a92ee92d4545448066fb664674c0ae5a9d5ea99 (patch) | |
tree | e24c885891708e270231568400d1edd3041cabc1 /include | |
parent | bea51b30b281039f0f43fb4f42028ddf33fb601f (diff) |
nfs: get clone_blksize when probing fsinfo
NFSv42 CLONE operation is supposed to respect it.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs4.h | 1 | ||||
-rw-r--r-- | include/linux/nfs_fs_sb.h | 1 | ||||
-rw-r--r-- | include/linux/nfs_xdr.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index c0c695b634d0..e7e78537aea2 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h | |||
@@ -422,6 +422,7 @@ enum lock_type4 { | |||
422 | #define FATTR4_WORD2_LAYOUT_TYPES (1UL << 0) | 422 | #define FATTR4_WORD2_LAYOUT_TYPES (1UL << 0) |
423 | #define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1) | 423 | #define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1) |
424 | #define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4) | 424 | #define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4) |
425 | #define FATTR4_WORD2_CLONE_BLKSIZE (1UL << 13) | ||
425 | #define FATTR4_WORD2_SECURITY_LABEL (1UL << 16) | 426 | #define FATTR4_WORD2_SECURITY_LABEL (1UL << 16) |
426 | 427 | ||
427 | /* MDS threshold bitmap bits */ | 428 | /* MDS threshold bitmap bits */ |
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index a50de1002b20..2469ab0bb3a1 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -147,6 +147,7 @@ struct nfs_server { | |||
147 | unsigned int acdirmax; | 147 | unsigned int acdirmax; |
148 | unsigned int namelen; | 148 | unsigned int namelen; |
149 | unsigned int options; /* extra options enabled by mount */ | 149 | unsigned int options; /* extra options enabled by mount */ |
150 | unsigned int clone_blksize; /* granularity of a CLONE operation */ | ||
150 | #define NFS_OPTION_FSCACHE 0x00000001 /* - local caching enabled */ | 151 | #define NFS_OPTION_FSCACHE 0x00000001 /* - local caching enabled */ |
151 | #define NFS_OPTION_MIGRATION 0x00000002 /* - NFSv4 migration enabled */ | 152 | #define NFS_OPTION_MIGRATION 0x00000002 /* - NFSv4 migration enabled */ |
152 | 153 | ||
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index ac678b7a65ed..92ff445e60a0 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -141,6 +141,7 @@ struct nfs_fsinfo { | |||
141 | __u32 lease_time; /* in seconds */ | 141 | __u32 lease_time; /* in seconds */ |
142 | __u32 layouttype; /* supported pnfs layout driver */ | 142 | __u32 layouttype; /* supported pnfs layout driver */ |
143 | __u32 blksize; /* preferred pnfs io block size */ | 143 | __u32 blksize; /* preferred pnfs io block size */ |
144 | __u32 clone_blksize; /* granularity of a CLONE operation */ | ||
144 | }; | 145 | }; |
145 | 146 | ||
146 | struct nfs_fsstat { | 147 | struct nfs_fsstat { |