public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] nfs[23] tcp breakage in mount with binary options
@ 2009-09-24 13:37 Al Viro
  0 siblings, 0 replies; only message in thread
From: Al Viro @ 2009-09-24 13:37 UTC (permalink / raw)
  To: Trond.Myklebust; +Cc: linux-kernel, Chuck Lever

We forget to set nfs_server.protocol in tcp case when old-style binary
options are passed to mount.  The thing remains zero and never validated
afterwards.  As the result, we hit BUG in fs/nfs/client.c:588.

Breakage has been introduced in NFS: Add nfs_alloc_parsed_mount_data
merged yesterday...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 810770f..29786d3 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1711,6 +1711,8 @@ static int nfs_validate_mount_data(void *options,
 
 		if (!(data->flags & NFS_MOUNT_TCP))
 			args->nfs_server.protocol = XPRT_TRANSPORT_UDP;
+		else
+			args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 		/* N.B. caller will free nfs_server.hostname in all cases */
 		args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL);
 		args->namlen		= data->namlen;

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-09-24 13:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-24 13:37 [PATCH] nfs[23] tcp breakage in mount with binary options Al Viro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox