The patch titled
Subject: ipc: remove redundant MSG_COPY check
has been removed from the -mm tree. Its filename was
ipc-message-queue-copy-feature-introduced-remove-redundant-msg_copy-check.patch
This patch was dropped because it was folded into ipc-message-queue-copy-feature-introduced.patch
------------------------------------------------------
From: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
Subject: ipc: remove redundant MSG_COPY check
Small cleanup patch.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/msg.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff -puN ipc/msg.c~ipc-message-queue-copy-feature-introduced-remove-redundant-msg_copy-check ipc/msg.c
--- a/ipc/msg.c~ipc-message-queue-copy-feature-introduced-remove-redundant-msg_copy-check
+++ a/ipc/msg.c
@@ -786,11 +786,8 @@ long do_msgrcv(int msqid, void __user *b
return -EINVAL;
if (msgflg & MSG_COPY) {
#ifdef CONFIG_CHECKPOINT_RESTORE
-
- if (msgflg & MSG_COPY) {
- copy_number = msgtyp;
- msgtyp = 0;
- }
+ copy_number = msgtyp;
+ msgtyp = 0;
/*
* Create dummy message to copy real message to.
_
Patches currently in -mm which might be from skinsbursky@xxxxxxxxxxxxx are
origin.patch
linux-next.patch
ipc-remove-forced-assignment-of-selected-message.patch
ipc-add-sysctl-to-specify-desired-next-object-id.patch
ipc-message-queue-receive-cleanup.patch
ipc-message-queue-copy-feature-introduced.patch
ipc-message-queue-copy-feature-introduced-cleanup-do_msgrcv-aroung-msg_copy-feature.patch
selftests-ipc-message-queue-copy-feature-test.patch
selftests-ipc-message-queue-copy-feature-test-update.patch
ipc-simplify-free_copy-call.patch
ipc-convert-prepare_copy-from-macro-to-function.patch
ipc-convert-prepare_copy-from-macro-to-function-fix.patch
ipc-simplify-message-copying.patch
ipc-add-more-comments-to-message-copying-related-code.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
