aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-09-24 15:39:55 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:18:17 -0400
commitbcf35617a7c3474ad12892dfbb089a572e5c06d2 (patch)
treef7fdd239743614ff8c1b00dc44b34565617689b8 /fs/nfs
parentNFS: Verify server address before invoking in-kernel mount client (diff)
downloadlinux-dev-bcf35617a7c3474ad12892dfbb089a572e5c06d2.tar.xz
linux-dev-bcf35617a7c3474ad12892dfbb089a572e5c06d2.zip
NFS: Show "nointr" mount option
The default "intr" setting is different for NFS and NFSv4. To avoid confusion on this issue, don't hide the "nointr" option in /proc/mounts. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 13a3ab30b143..fa517ae9207f 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -424,7 +424,7 @@ 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", "" },
+ { NFS_MOUNT_INTR, ",intr", ",nointr" },
{ NFS_MOUNT_NOCTO, ",nocto", "" },
{ NFS_MOUNT_NOAC, ",noac", "" },
{ NFS_MOUNT_NONLM, ",nolock", "" },