[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20061010231805.3517f5e1.akpm@osdl.org>
Date: Tue, 10 Oct 2006 23:18:05 -0700
From: Andrew Morton <akpm@...l.org>
To: Nick Piggin <nickpiggin@...oo.com.au>,
Nick Piggin <npiggin@...e.de>,
Linux Memory Management <linux-mm@...ck.org>,
Linux Kernel <linux-kernel@...r.kernel.org>
Subject: [patch 5/6] generic_file_buffered_write(): max_len cleanup
From: Andrew Morton <akpm@...l.org>
More dirty code.
Signed-off-by: Andrew Morton <akpm@...l.org>
---
mm/filemap.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff -puN mm/filemap.c~generic_file_buffered_write-max_len-cleanup mm/filemap.c
--- a/mm/filemap.c~generic_file_buffered_write-max_len-cleanup
+++ a/mm/filemap.c
@@ -2090,7 +2090,6 @@ generic_file_buffered_write(struct kiocb
do {
pgoff_t index; /* Pagecache index for current page */
unsigned long offset; /* Offset into pagecache page */
- unsigned long maxlen; /* Bytes remaining in current iovec */
size_t bytes; /* Bytes to write to page */
size_t copied; /* Bytes copied from user */
@@ -2100,9 +2099,7 @@ generic_file_buffered_write(struct kiocb
if (bytes > count)
bytes = count;
- maxlen = cur_iov->iov_len - iov_offset;
- if (maxlen > bytes)
- maxlen = bytes;
+ bytes = min(cur_iov->iov_len - iov_offset, bytes);
/*
* Bring in the user page that we will copy from _first_.
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists