From 368ddbd0ac62bd7d191f76568d0a3bce746936f7 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 24 Sep 2007 15:39:55 -0400
Subject: [PATCH] --- yaml --- r: 69241 b: refs/heads/master c:
 bcf35617a7c3474ad12892dfbb089a572e5c06d2 h: refs/heads/master i:   69239:
 034aa657330e89e4d7926df039ec440f53cd25af v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f438fcb56f8e..c6294340fe56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e88e0618cb1e354a44cc49a996df4dd89511039
+refs/heads/master: bcf35617a7c3474ad12892dfbb089a572e5c06d2
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 13a3ab30b143..fa517ae9207f 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/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", "" },