summaryrefslogtreecommitdiff
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-28 00:14:08 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-28 00:14:08 +0300
commitf6248dd88dba3aeb19351410a027d92eee7ceb72 (patch)
tree9dfe33ca030186ffd5007784d0647a8306d41be9 /fs/nfs/client.c
parent880a66275ef4d1e08e5d4dcf4cec768de18c68ef (diff)
parent02cb489be7ad07e74ab40baa908d2e20460ebdb2 (diff)
downloadlinux-f6248dd88dba3aeb19351410a027d92eee7ceb72.tar.xz
Merge branches 'acpi-pm' and 'acpi-numa'
* acpi-pm: ACPI / PM / EC: Flush all EC work in acpi_freeze_sync() ACPI / EC: Add parameter to force disable the GPE on suspend * acpi-numa: ACPI: NUMA: Fix typo in the full name of SRAT ACPI: NUMA: add missing include in acpi_numa.h
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index ee5ddbd36088..efebe6cf4378 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -820,6 +820,7 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour
target->caps = source->caps;
target->options = source->options;
target->auth_info = source->auth_info;
+ target->port = source->port;
}
EXPORT_SYMBOL_GPL(nfs_server_copy_userdata);