git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
fs
/
nfs
/
client.c
diff --git
a/fs/nfs/client.c
b/fs/nfs/client.c
index
d03a400
..
4ba011d
100644
(file)
--- a/
fs/nfs/client.c
+++ b/
fs/nfs/client.c
@@
-1018,6
+1018,7
@@
static void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_serve
target->acdirmax = source->acdirmax;
target->caps = source->caps;
target->options = source->options;
+ target->port = source->port;
}
static void nfs_server_insert_lists(struct nfs_server *server)