diff options
Diffstat (limited to 'fs/nfs/nfsroot.c')
-rw-r--r-- | fs/nfs/nfsroot.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index fd5bc596fe8a..1b272a135a31 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c | |||
@@ -124,6 +124,7 @@ enum { | |||
124 | Opt_soft, Opt_hard, Opt_intr, | 124 | Opt_soft, Opt_hard, Opt_intr, |
125 | Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, | 125 | Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, |
126 | Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp, | 126 | Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp, |
127 | Opt_acl, Opt_noacl, | ||
127 | /* Error token */ | 128 | /* Error token */ |
128 | Opt_err | 129 | Opt_err |
129 | }; | 130 | }; |
@@ -158,6 +159,8 @@ static match_table_t __initdata tokens = { | |||
158 | {Opt_udp, "udp"}, | 159 | {Opt_udp, "udp"}, |
159 | {Opt_tcp, "proto=tcp"}, | 160 | {Opt_tcp, "proto=tcp"}, |
160 | {Opt_tcp, "tcp"}, | 161 | {Opt_tcp, "tcp"}, |
162 | {Opt_acl, "acl"}, | ||
163 | {Opt_noacl, "noacl"}, | ||
161 | {Opt_err, NULL} | 164 | {Opt_err, NULL} |
162 | 165 | ||
163 | }; | 166 | }; |
@@ -266,6 +269,12 @@ static int __init root_nfs_parse(char *name, char *buf) | |||
266 | case Opt_tcp: | 269 | case Opt_tcp: |
267 | nfs_data.flags |= NFS_MOUNT_TCP; | 270 | nfs_data.flags |= NFS_MOUNT_TCP; |
268 | break; | 271 | break; |
272 | case Opt_acl: | ||
273 | nfs_data.flags &= ~NFS_MOUNT_NOACL; | ||
274 | break; | ||
275 | case Opt_noacl: | ||
276 | nfs_data.flags |= NFS_MOUNT_NOACL; | ||
277 | break; | ||
269 | default : | 278 | default : |
270 | return 0; | 279 | return 0; |
271 | } | 280 | } |