On Tue, 2013-01-22 at 08:40 -0500, Steve Dickson wrote:
> From: David Quigley <dpquigl@xxxxxxxxxxxxxxx>
>
> This patch adds several new flags to allow the NFS client and server to
> determine if this attribute is supported and if it is being sent over the wire.
>
> Signed-off-by: Matthew N. Dodd <Matthew.Dodd@xxxxxxxxxx>
> Signed-off-by: Miguel Rodel Felipe <Rodel_FM@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Phua Eu Gene <PHUA_Eu_Gene@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Khin Mi Mi Aung <Mi_Mi_AUNG@xxxxxxxxxxxxxxxxx>
> ---
> include/linux/nfs4.h | 1 +
> include/linux/nfs_fs_sb.h | 1 +
> include/linux/nfs_xdr.h | 5 ++++-
> include/uapi/linux/nfs4.h | 1 +
> 4 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
> index e111fa4..f9235b4 100644
> --- a/include/linux/nfs4.h
> +++ b/include/linux/nfs4.h
> @@ -373,6 +373,7 @@ enum lock_type4 {
> #define FATTR4_WORD1_MOUNTED_ON_FILEID (1UL << 23)
> #define FATTR4_WORD1_FS_LAYOUT_TYPES (1UL << 30)
> #define FATTR4_WORD2_LAYOUT_BLKSIZE (1UL << 1)
> +#define FATTR4_WORD2_SECURITY_LABEL (1UL << 17)
> #define FATTR4_WORD2_MDSTHRESHOLD (1UL << 4)
>
> /* MDS threshold bitmap bits */
> diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
> index 6c6ed15..d507357 100644
> --- a/include/linux/nfs_fs_sb.h
> +++ b/include/linux/nfs_fs_sb.h
> @@ -197,5 +197,6 @@ struct nfs_server {
> #define NFS_CAP_MTIME (1U << 13)
> #define NFS_CAP_POSIX_LOCK (1U << 14)
> #define NFS_CAP_UIDGID_NOMAP (1U << 15)
> +#define NFS_CAP_SECURITY_LABEL (1U << 16)
>
> #endif
> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
> index 29adb12..fac114d 100644
> --- a/include/linux/nfs_xdr.h
> +++ b/include/linux/nfs_xdr.h
> @@ -104,6 +104,7 @@ struct nfs_fattr {
> #define NFS_ATTR_FATTR_MOUNTED_ON_FILEID (1U << 22)
> #define NFS_ATTR_FATTR_OWNER_NAME (1U << 23)
> #define NFS_ATTR_FATTR_GROUP_NAME (1U << 24)
> +#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)
>
> #define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
> | NFS_ATTR_FATTR_MODE \
> @@ -123,7 +124,8 @@ struct nfs_fattr {
> #define NFS_ATTR_FATTR_V3 (NFS_ATTR_FATTR \
> | NFS_ATTR_FATTR_SPACE_USED)
> #define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
> - | NFS_ATTR_FATTR_SPACE_USED)
> + | NFS_ATTR_FATTR_SPACE_USED \
> + | NFS_ATTR_FATTR_V4_SECURITY_LABEL)
>
> /*
> * Info on the file system
> @@ -597,6 +599,7 @@ struct nfs_entry {
> int eof;
> struct nfs_fh * fh;
> struct nfs_fattr * fattr;
> + struct nfs4_label *label;
This probably needs a forward declaration of struct nfs4_label.
Particularly since the definition only appears in patch 07/14...
> unsigned char d_type;
> struct nfs_server * server;
> };
> diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h
> index 788128e..dcc8582 100644
> --- a/include/uapi/linux/nfs4.h
> +++ b/include/uapi/linux/nfs4.h
> @@ -25,6 +25,7 @@
> #define NFS4_MAXNAMLEN NAME_MAX
> #define NFS4_OPAQUE_LIMIT 1024
> #define NFS4_MAX_SESSIONID_LEN 16
> +#define NFS4_MAXLABELLEN 4096
>
> #define NFS4_ACCESS_READ 0x0001
> #define NFS4_ACCESS_LOOKUP 0x0002
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
