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 2/10] mm: revert "generic_file_buffered_write(): handle zero length iovec segments" Date: Sat, 13 Jan 2007 04:24:33 +0100 (CET) [thread overview] Message-ID: <20070113011218.9449.4113.sendpatchset@linux.site> (raw) In-Reply-To: <20070113011159.9449.4327.sendpatchset@linux.site> From: Andrew Morton <akpm@osdl.org> Revert 81b0c8713385ce1b1b9058e916edcf9561ad76d6. This was a bugfix against 6527c2bdf1f833cc18e8f42bd97973d583e4aa83, which we also revert. Signed-off-by: Andrew Morton <akpm@osdl.org> 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 @@ -1911,12 +1911,6 @@ generic_file_buffered_write(struct kiocb break; } - if (unlikely(bytes == 0)) { - status = 0; - copied = 0; - goto zero_length_segment; - } - status = a_ops->prepare_write(file, page, offset, offset+bytes); if (unlikely(status)) { loff_t isize = i_size_read(inode); @@ -1946,8 +1940,7 @@ generic_file_buffered_write(struct kiocb page_cache_release(page); continue; } -zero_length_segment: - if (likely(copied >= 0)) { + if (likely(copied > 0)) { if (!status) status = copied; Index: linux-2.6/mm/filemap.h =================================================================== --- linux-2.6.orig/mm/filemap.h +++ linux-2.6/mm/filemap.h @@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iove const struct iovec *iov = *iovp; size_t base = *basep; - do { + while (bytes) { int copy = min(bytes, iov->iov_len - base); bytes -= copy; @@ -96,7 +96,7 @@ filemap_set_next_iovec(const struct iove iov++; base = 0; } - } while (bytes); + } *iovp = iov; *basep = base; }
WARNING: multiple messages have this Message-ID (diff)
From: Nick Piggin <npiggin@suse.de> From: Andrew Morton <akpm@osdl.org> 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 2/10] mm: revert "generic_file_buffered_write(): handle zero length iovec segments" Date: Sat, 13 Jan 2007 04:24:33 +0100 (CET) [thread overview] Message-ID: <20070113011218.9449.4113.sendpatchset@linux.site> (raw) In-Reply-To: <20070113011159.9449.4327.sendpatchset@linux.site> Revert 81b0c8713385ce1b1b9058e916edcf9561ad76d6. This was a bugfix against 6527c2bdf1f833cc18e8f42bd97973d583e4aa83, which we also revert. Signed-off-by: Andrew Morton <akpm@osdl.org> 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 @@ -1911,12 +1911,6 @@ generic_file_buffered_write(struct kiocb break; } - if (unlikely(bytes == 0)) { - status = 0; - copied = 0; - goto zero_length_segment; - } - status = a_ops->prepare_write(file, page, offset, offset+bytes); if (unlikely(status)) { loff_t isize = i_size_read(inode); @@ -1946,8 +1940,7 @@ generic_file_buffered_write(struct kiocb page_cache_release(page); continue; } -zero_length_segment: - if (likely(copied >= 0)) { + if (likely(copied > 0)) { if (!status) status = copied; Index: linux-2.6/mm/filemap.h =================================================================== --- linux-2.6.orig/mm/filemap.h +++ linux-2.6/mm/filemap.h @@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iove const struct iovec *iov = *iovp; size_t base = *basep; - do { + while (bytes) { int copy = min(bytes, iov->iov_len - base); bytes -= copy; @@ -96,7 +96,7 @@ filemap_set_next_iovec(const struct iove iov++; base = 0; } - } while (bytes); + } *iovp = iov; *basep = base; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2007-01-13 3:24 UTC|newest] Thread overview: 34+ 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 ` Nick Piggin 2007-01-13 3:24 ` [patch 1/10] fs: libfs buffered write leak fix Nick Piggin 2007-01-13 3:24 ` Nick Piggin 2007-01-13 3:24 ` Nick Piggin [this message] 2007-01-13 3:24 ` [patch 2/10] mm: revert "generic_file_buffered_write(): handle zero length iovec segments" Nick Piggin, Andrew Morton 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 ` Nick Piggin, Andrew Morton 2007-01-13 3:24 ` [patch 4/10] mm: generic_file_buffered_write cleanup Nick Piggin 2007-01-13 3:24 ` Nick Piggin, Andrew Morton 2007-01-13 3:25 ` [patch 5/10] mm: debug write deadlocks Nick Piggin 2007-01-13 3:25 ` Nick Piggin 2007-01-13 3:25 ` [patch 6/10] mm: be sure to trim blocks Nick Piggin 2007-01-13 3:25 ` Nick Piggin 2007-01-14 14:25 ` Dmitriy Monakhov 2007-01-14 14:25 ` Dmitriy Monakhov 2007-01-20 3:50 ` Nick Piggin 2007-01-20 3:50 ` Nick Piggin 2007-01-16 17:36 ` Peter Zijlstra 2007-01-16 17:36 ` Peter Zijlstra 2007-01-16 19:14 ` Peter Zijlstra 2007-01-16 19:14 ` Peter Zijlstra 2007-01-20 3:52 ` Nick Piggin 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 2007-01-13 3:25 ` [patch 8/10] mm: generic_file_buffered_write cleanup more Nick Piggin 2007-01-13 3:25 ` Nick Piggin 2007-01-13 3:25 ` [patch 9/10] mm: generic_file_buffered_write iovec cleanup Nick Piggin 2007-01-13 3:25 ` Nick Piggin 2007-01-13 3:25 ` [patch 10/10] mm: fix pagecache write deadlocks Nick Piggin 2007-01-13 3:25 ` Nick Piggin 2007-01-14 3:59 ` 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=20070113011218.9449.4113.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 \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.