The patch titled
some-cleanup-in-the-pipe-code-tidy
has been removed from the -mm tree. Its filename is
some-cleanup-in-the-pipe-code-tidy.patch
This patch was dropped because it was folded into some-cleanup-in-the-pipe-code.patch
------------------------------------------------------
Subject: some-cleanup-in-the-pipe-code-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Nicer naming.
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/pipe.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff -puN fs/pipe.c~some-cleanup-in-the-pipe-code-tidy fs/pipe.c
--- a/fs/pipe.c~some-cleanup-in-the-pipe-code-tidy
+++ a/fs/pipe.c
@@ -952,7 +952,7 @@ int do_pipe(int *fd)
{
struct file *fw, *fr;
int error;
- int i, j;
+ int fdw, fdr;
fw = create_write_pipe();
if (IS_ERR(fw))
@@ -965,22 +965,22 @@ int do_pipe(int *fd)
error = get_unused_fd();
if (error < 0)
goto err_read_pipe;
- i = error;
+ fdr = error;
error = get_unused_fd();
if (error < 0)
- goto err_i_fd;
- j = error;
+ goto err_fdr;
+ fdw = error;
- fd_install(i, fr);
- fd_install(j, fw);
- fd[0] = i;
- fd[1] = j;
+ fd_install(fdr, fr);
+ fd_install(fdw, fw);
+ fd[0] = fdr;
+ fd[1] = fdw;
return 0;
- err_i_fd:
- put_unused_fd(i);
+ err_fdr:
+ put_unused_fd(fdr);
err_read_pipe:
put_filp(fr);
err_write_pipe:
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list_del-debug-fix.patch
arch-i386-pci-mmconfigc-tlb-flush-fix-tweaks.patch
maximum-latency-tracking-infrastructure.patch
submit-checklist-mention-headers_check.patch
ntp-move-all-the-ntp-related-code-to-ntpc.patch
reiserfs-on-demand-bitmap-loading.patch
add-vector-aio-support.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id.patch
generic-ioremap_page_range-x86_64-conversion.patch
some-cleanup-in-the-pipe-code.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.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
