diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-06-12 18:37:41 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-09 18:09:21 +0200 |
| commit | d33e4dfeab5eb0c3c1359cc1a399f2f8b49e18de (patch) | |
| tree | f1ddcbcb88652023657ca7f9447c4528f6cbeca9 | |
| parent | NFS: Allow any value for the "retry" option (diff) | |
| download | linux-d33e4dfeab5eb0c3c1359cc1a399f2f8b49e18de.tar.xz linux-d33e4dfeab5eb0c3c1359cc1a399f2f8b49e18de.zip | |
NFS: Treat "intr" and "nointr" options as deprecated
Clean up: the "intr" and "nointr" mount options were recently retired.
Document this in the NFS mount option parser.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/super.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 5278eef61110..f824c415c8a7 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -65,7 +65,6 @@ enum { /* Mount options that take no arguments */ Opt_soft, Opt_hard, - Opt_intr, Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, Opt_noac, @@ -105,8 +104,8 @@ static match_table_t nfs_mount_option_tokens = { { Opt_soft, "soft" }, { Opt_hard, "hard" }, - { Opt_intr, "intr" }, - { Opt_nointr, "nointr" }, + { Opt_deprecated, "intr" }, + { Opt_deprecated, "nointr" }, { Opt_posix, "posix" }, { Opt_noposix, "noposix" }, { Opt_cto, "cto" }, @@ -787,9 +786,6 @@ static int nfs_parse_mount_options(char *raw, case Opt_hard: mnt->flags &= ~NFS_MOUNT_SOFT; break; - case Opt_intr: - case Opt_nointr: - break; case Opt_posix: mnt->flags |= NFS_MOUNT_POSIX; break; @@ -1105,6 +1101,8 @@ static int nfs_parse_mount_options(char *raw, case Opt_userspace: case Opt_deprecated: + dfprintk(MOUNT, "NFS: ignoring mount option " + "'%s'\n", p); break; default: |