Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
b6fb0df1
Commit
b6fb0df1
authored
Jun 23, 2010
by
Andy Grover
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RDS/IB: Make ib_recv_refill return void
Signed-off-by:
Andy Grover
<
andy.grover@oracle.com
>
parent
fbf4d7e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
net/rds/ib.h
net/rds/ib.h
+1
-1
net/rds/ib_recv.c
net/rds/ib_recv.c
+1
-5
No files found.
net/rds/ib.h
View file @
b6fb0df1
...
@@ -323,7 +323,7 @@ void rds_ib_recv_exit(void);
...
@@ -323,7 +323,7 @@ void rds_ib_recv_exit(void);
int
rds_ib_recv
(
struct
rds_connection
*
conn
);
int
rds_ib_recv
(
struct
rds_connection
*
conn
);
int
rds_ib_recv_alloc_caches
(
struct
rds_ib_connection
*
ic
);
int
rds_ib_recv_alloc_caches
(
struct
rds_ib_connection
*
ic
);
void
rds_ib_recv_free_caches
(
struct
rds_ib_connection
*
ic
);
void
rds_ib_recv_free_caches
(
struct
rds_ib_connection
*
ic
);
int
rds_ib_recv_refill
(
struct
rds_connection
*
conn
,
int
prefill
);
void
rds_ib_recv_refill
(
struct
rds_connection
*
conn
,
int
prefill
);
void
rds_ib_inc_free
(
struct
rds_incoming
*
inc
);
void
rds_ib_inc_free
(
struct
rds_incoming
*
inc
);
int
rds_ib_inc_copy_to_user
(
struct
rds_incoming
*
inc
,
struct
iovec
*
iov
,
int
rds_ib_inc_copy_to_user
(
struct
rds_incoming
*
inc
,
struct
iovec
*
iov
,
size_t
size
);
size_t
size
);
...
...
net/rds/ib_recv.c
View file @
b6fb0df1
...
@@ -353,7 +353,7 @@ static int rds_ib_recv_refill_one(struct rds_connection *conn,
...
@@ -353,7 +353,7 @@ static int rds_ib_recv_refill_one(struct rds_connection *conn,
*
*
* -1 is returned if posting fails due to temporary resource exhaustion.
* -1 is returned if posting fails due to temporary resource exhaustion.
*/
*/
int
rds_ib_recv_refill
(
struct
rds_connection
*
conn
,
int
prefill
)
void
rds_ib_recv_refill
(
struct
rds_connection
*
conn
,
int
prefill
)
{
{
struct
rds_ib_connection
*
ic
=
conn
->
c_transport_data
;
struct
rds_ib_connection
*
ic
=
conn
->
c_transport_data
;
struct
rds_ib_recv_work
*
recv
;
struct
rds_ib_recv_work
*
recv
;
...
@@ -367,14 +367,12 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
...
@@ -367,14 +367,12 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
if
(
pos
>=
ic
->
i_recv_ring
.
w_nr
)
{
if
(
pos
>=
ic
->
i_recv_ring
.
w_nr
)
{
printk
(
KERN_NOTICE
"Argh - ring alloc returned pos=%u
\n
"
,
printk
(
KERN_NOTICE
"Argh - ring alloc returned pos=%u
\n
"
,
pos
);
pos
);
ret
=
-
EINVAL
;
break
;
break
;
}
}
recv
=
&
ic
->
i_recvs
[
pos
];
recv
=
&
ic
->
i_recvs
[
pos
];
ret
=
rds_ib_recv_refill_one
(
conn
,
recv
,
prefill
);
ret
=
rds_ib_recv_refill_one
(
conn
,
recv
,
prefill
);
if
(
ret
)
{
if
(
ret
)
{
ret
=
-
1
;
break
;
break
;
}
}
...
@@ -388,7 +386,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
...
@@ -388,7 +386,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
"%pI4 returned %d, disconnecting and "
"%pI4 returned %d, disconnecting and "
"reconnecting
\n
"
,
&
conn
->
c_faddr
,
"reconnecting
\n
"
,
&
conn
->
c_faddr
,
ret
);
ret
);
ret
=
-
1
;
break
;
break
;
}
}
...
@@ -401,7 +398,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
...
@@ -401,7 +398,6 @@ int rds_ib_recv_refill(struct rds_connection *conn, int prefill)
if
(
ret
)
if
(
ret
)
rds_ib_ring_unalloc
(
&
ic
->
i_recv_ring
,
1
);
rds_ib_ring_unalloc
(
&
ic
->
i_recv_ring
,
1
);
return
ret
;
}
}
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment