LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Nick Piggin <npiggin@suse.de>
To: Linux Memory Management <linux-mm@kvack.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
Linux Filesystems <linux-fsdevel@vger.kernel.org>,
Nick Piggin <npiggin@suse.de>, Andrew Morton <akpm@osdl.org>
Subject: [patch 8/10] mm: generic_file_buffered_write cleanup more
Date: Sat, 13 Jan 2007 04:25:31 +0100 (CET) [thread overview]
Message-ID: <20070113011315.9449.43708.sendpatchset@linux.site> (raw)
In-Reply-To: <20070113011159.9449.4327.sendpatchset@linux.site>
No need to do the confusing switch of variables from copied into status.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Index: linux-2.6/mm/filemap.c
===================================================================
--- linux-2.6.orig/mm/filemap.c
+++ linux-2.6/mm/filemap.c
@@ -1898,28 +1898,22 @@ generic_file_buffered_write(struct kiocb
goto fs_write_aop_error;
if (likely(copied > 0)) {
- if (!status)
- status = copied;
-
- if (status >= 0) {
- written += status;
- count -= status;
- pos += status;
- buf += status;
- if (unlikely(nr_segs > 1)) {
- filemap_set_next_iovec(&cur_iov,
- &iov_offset, status);
- if (count)
- buf = cur_iov->iov_base +
- iov_offset;
- } else {
- iov_offset += status;
- }
+ written += copied;
+ count -= copied;
+ pos += copied;
+ buf += copied;
+ if (unlikely(nr_segs > 1)) {
+ filemap_set_next_iovec(&cur_iov,
+ &iov_offset, copied);
+ if (count)
+ buf = cur_iov->iov_base + iov_offset;
+ } else {
+ iov_offset += copied;
}
}
if (unlikely(copied != bytes))
- if (status >= 0)
- status = -EFAULT;
+ status = -EFAULT;
+
unlock_page(page);
mark_page_accessed(page);
page_cache_release(page);
next prev parent reply other threads:[~2007-01-13 3:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-13 3:24 [patch 0/10] buffered write deadlock fix Nick Piggin
2007-01-13 3:24 ` [patch 1/10] fs: libfs buffered write leak fix Nick Piggin
2007-01-13 3:24 ` [patch 2/10] mm: revert "generic_file_buffered_write(): handle zero length iovec segments" Nick Piggin
2007-01-13 3:24 ` [patch 3/10] mm: revert "generic_file_buffered_write(): deadlock on vectored write" Nick Piggin
2007-01-13 3:24 ` [patch 4/10] mm: generic_file_buffered_write cleanup Nick Piggin
2007-01-13 3:25 ` [patch 5/10] mm: debug write deadlocks Nick Piggin
2007-01-13 3:25 ` [patch 6/10] mm: be sure to trim blocks Nick Piggin
2007-01-14 14:25 ` Dmitriy Monakhov
2007-01-20 3:50 ` Nick Piggin
2007-01-16 17:36 ` Peter Zijlstra
2007-01-16 19:14 ` Peter Zijlstra
2007-01-20 3:52 ` Nick Piggin
2007-01-13 3:25 ` [patch 7/10] mm: cleanup pagecache insertion operations Nick Piggin
2007-01-13 3:25 ` Nick Piggin [this message]
2007-01-13 3:25 ` [patch 9/10] mm: generic_file_buffered_write iovec cleanup Nick Piggin
2007-01-13 3:25 ` [patch 10/10] mm: fix pagecache write deadlocks Nick Piggin
2007-01-14 3:59 ` Nick Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070113011315.9449.43708.sendpatchset@linux.site \
--to=npiggin@suse.de \
--cc=akpm@osdl.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--subject='Re: [patch 8/10] mm: generic_file_buffered_write cleanup more' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).