From: Andrew Morton <akpm@osdl.org>

Nicer naming.

Cc: Andi Kleen <ak@suse.de>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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:
_