diff options
| author | Trond Myklebust | 2008-03-08 17:49:24 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2008-03-08 17:49:24 +0100 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /fs/nfs/internal.h | |
| parent | Merge branch 'cleanups' into next (diff) | |
| parent | x86_64: make ptrace always sign-extend orig_ax to 64 bits (diff) | |
| download | kernel-qcow2-linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.gz kernel-qcow2-linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz kernel-qcow2-linux-9446389ef612096704fdf18fa79bab423d4110f0.zip | |
Merge commit 'origin' into devel
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 985dc2931031..4c1122a13844 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -3,6 +3,7 @@ */ #include <linux/mount.h> +#include <linux/security.h> struct nfs_string; @@ -57,6 +58,8 @@ struct nfs_parsed_mount_data { char *export_path; int protocol; } nfs_server; + + struct security_mnt_opts lsm_opts; }; /* client.c */ |