The patch titled
AFS: use patched rxrpc_kernel_send_data() correctly
has been removed from the -mm tree. Its filename was
afs-use-patched-rxrpc_kernel_send_data-correctly.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: AFS: use patched rxrpc_kernel_send_data() correctly
From: David Howells <[EMAIL PROTECTED]>
Fix afs_send_simple_reply() to accept a greater-than-zero return value from
rxrpc_kernel_send_data() as being a successful return rather than thinking
it an error and aborting the call.
rxrpc_kernel_send_data() previously returned zero incorrectly when it
worked successfully, but has been patched to return the number of bytes it
transmitted.
Signed-off-by: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
fs/afs/rxrpc.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff -puN fs/afs/rxrpc.c~afs-use-patched-rxrpc_kernel_send_data-correctly
fs/afs/rxrpc.c
--- a/fs/afs/rxrpc.c~afs-use-patched-rxrpc_kernel_send_data-correctly
+++ a/fs/afs/rxrpc.c
@@ -792,6 +792,7 @@ void afs_send_simple_reply(struct afs_ca
{
struct msghdr msg;
struct iovec iov[1];
+ int n;
_enter("");
@@ -806,22 +807,20 @@ void afs_send_simple_reply(struct afs_ca
msg.msg_flags = 0;
call->state = AFS_CALL_AWAIT_ACK;
- switch (rxrpc_kernel_send_data(call->rxcall, &msg, len)) {
- case 0:
+ n = rxrpc_kernel_send_data(call->rxcall, &msg, len);
+ if (n >= 0) {
_leave(" [replied]");
return;
-
- case -ENOMEM:
+ }
+ if (n == -ENOMEM) {
_debug("oom");
rxrpc_kernel_abort_call(call->rxcall, RX_USER_ABORT);
- default:
- rxrpc_kernel_end_call(call->rxcall);
- call->rxcall = NULL;
- call->type->destructor(call);
- afs_free_call(call);
- _leave(" [error]");
- return;
}
+ rxrpc_kernel_end_call(call->rxcall);
+ call->rxcall = NULL;
+ call->type->destructor(call);
+ afs_free_call(call);
+ _leave(" [error]");
}
/*
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
frv-fix-linkage-problems.patch
nommu-vmalloc_32_user-vm_insert_page-and-symbol-exports.patch
nommu-present-backing-device-capabilities-for-mtd.patch
nommu-add-support-for-direct-mapping-through-mtdconcat.patch
afs-fix-file-locking.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
