summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2009-06-17 18:02:09 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-06-17 18:02:09 -0700
commitc381ad2cf2d5dcd3991bcc8a18fddd9d5c66ccaa (patch)
treecb9e9a13edba575a98438f6b765d535d27790342
parentbf40d3435caf49369058b1ed6bbc92f8e2bd92f1 (diff)
downloadlinux-3.10-c381ad2cf2d5dcd3991bcc8a18fddd9d5c66ccaa.tar.gz
linux-3.10-c381ad2cf2d5dcd3991bcc8a18fddd9d5c66ccaa.tar.bz2
linux-3.10-c381ad2cf2d5dcd3991bcc8a18fddd9d5c66ccaa.zip
NFS: Do not display the setting of the "intr" mount option
The "intr" mount option has been deprecated for a while, but /proc/mounts continues to display "nointr" whether "intr" or "nointr" has been specified for a mount point. Since these options do not have any effect, simply do not display them. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/super.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 98b47d17740..539a61a0887 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -514,7 +514,6 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
const char *nostr;
} nfs_info[] = {
{ NFS_MOUNT_SOFT, ",soft", ",hard" },
- { NFS_MOUNT_INTR, ",intr", ",nointr" },
{ NFS_MOUNT_POSIX, ",posix", "" },
{ NFS_MOUNT_NOCTO, ",nocto", "" },
{ NFS_MOUNT_NOAC, ",noac", "" },