From: Scott Mayhew <smayhew@redhat.com>
To: trond.myklebust@primarydata.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 1/1] nfs: Ensure NFS_MOUNT_TCP is correctly set for v4 mounts
Date: Thu, 29 May 2014 13:25:51 -0400 [thread overview]
Message-ID: <1401384351-21993-2-git-send-email-smayhew@redhat.com> (raw)
In-Reply-To: <1401384351-21993-1-git-send-email-smayhew@redhat.com>
The NFS_MOUNT_TCP flag needs to be correctly set in the nfs_server->flags
field, otherwise remount operations are likely to run afoul of the flags
check in nfs_compare_remount_data() on systems where /etc/mtab is
symlinked to /proc/mounts.
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
fs/nfs/super.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 2cb5694..0ae4e73 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2726,6 +2726,9 @@ static void nfs4_validate_mount_flags(struct nfs_parsed_mount_data *args)
{
args->flags &= ~(NFS_MOUNT_NONLM|NFS_MOUNT_NOACL|NFS_MOUNT_VER3|
NFS_MOUNT_LOCAL_FLOCK|NFS_MOUNT_LOCAL_FCNTL);
+
+ if (args->nfs_server.protocol == XPRT_TRANSPORT_TCP)
+ args->flags |= NFS_MOUNT_TCP;
}
/*
--
1.9.0
next prev parent reply other threads:[~2014-05-29 17:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-29 17:25 [PATCH 0/1] nfs: Ensure NFS_MOUNT_TCP is correctly set for v4 mounts Scott Mayhew
2014-05-29 17:25 ` Scott Mayhew [this message]
2014-05-29 17:33 ` [PATCH 1/1] " Trond Myklebust
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401384351-21993-2-git-send-email-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.