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@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html