dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Chuck Lever 2008-06-12 12:37:41 -04:00 committed by Trond Myklebust
parent ecbb3845dd
commit d33e4dfeab
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/super.c
View File

@ -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: