projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfs-for-4.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[firefly-linux-kernel-4.4.55.git]
/
net
/
rds
/
transport.c
diff --git
a/net/rds/transport.c
b/net/rds/transport.c
index 83498e1c75b83f3230dace76da031a6f46753ee9..f3afd1d60d3c7a7880993554c6375754fb4c6ff8 100644
(file)
--- a/
net/rds/transport.c
+++ b/
net/rds/transport.c
@@
-77,7
+77,7
@@
void rds_trans_put(struct rds_transport *trans)
module_put(trans->t_owner);
}
module_put(trans->t_owner);
}
-struct rds_transport *rds_trans_get_preferred(__be32 addr)
+struct rds_transport *rds_trans_get_preferred(
struct net *net,
__be32 addr)
{
struct rds_transport *ret = NULL;
struct rds_transport *trans;
{
struct rds_transport *ret = NULL;
struct rds_transport *trans;
@@
-90,7
+90,7
@@
struct rds_transport *rds_trans_get_preferred(__be32 addr)
for (i = 0; i < RDS_TRANS_COUNT; i++) {
trans = transports[i];
for (i = 0; i < RDS_TRANS_COUNT; i++) {
trans = transports[i];
- if (trans && (trans->laddr_check(addr) == 0) &&
+ if (trans && (trans->laddr_check(
net,
addr) == 0) &&
(!trans->t_owner || try_module_get(trans->t_owner))) {
ret = trans;
break;
(!trans->t_owner || try_module_get(trans->t_owner))) {
ret = trans;
break;