diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
| commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
| tree | a1142f3a5058d16504863ac777b21efdf1eca49e /net/sunrpc | |
| parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
| parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 124676c13780..e28909fddd30 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
| @@ -1136,7 +1136,7 @@ rpcrdma_init_fmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf) | |||
| 1136 | int i, rc; | 1136 | int i, rc; |
| 1137 | 1137 | ||
| 1138 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; | 1138 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; |
| 1139 | dprintk("RPC: %s: initalizing %d FMRs\n", __func__, i); | 1139 | dprintk("RPC: %s: initializing %d FMRs\n", __func__, i); |
| 1140 | 1140 | ||
| 1141 | while (i--) { | 1141 | while (i--) { |
| 1142 | r = kzalloc(sizeof(*r), GFP_KERNEL); | 1142 | r = kzalloc(sizeof(*r), GFP_KERNEL); |
| @@ -1169,7 +1169,7 @@ rpcrdma_init_frmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf) | |||
| 1169 | int i, rc; | 1169 | int i, rc; |
| 1170 | 1170 | ||
| 1171 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; | 1171 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; |
| 1172 | dprintk("RPC: %s: initalizing %d FRMRs\n", __func__, i); | 1172 | dprintk("RPC: %s: initializing %d FRMRs\n", __func__, i); |
| 1173 | 1173 | ||
| 1174 | while (i--) { | 1174 | while (i--) { |
| 1175 | r = kzalloc(sizeof(*r), GFP_KERNEL); | 1175 | r = kzalloc(sizeof(*r), GFP_KERNEL); |