Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751156AbWJMQoI (ORCPT ); Fri, 13 Oct 2006 12:44:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751160AbWJMQoI (ORCPT ); Fri, 13 Oct 2006 12:44:08 -0400 Received: from mx2.suse.de ([195.135.220.15]:32717 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S1751156AbWJMQoG (ORCPT ); Fri, 13 Oct 2006 12:44:06 -0400 From: Nick Piggin To: Linux Memory Management Cc: Neil Brown , Andrew Morton , Anton Altaparmakov , Chris Mason , Linux Kernel , Nick Piggin Message-Id: <20061013143526.15438.56911.sendpatchset@linux.site> In-Reply-To: <20061013143516.15438.8802.sendpatchset@linux.site> References: <20061013143516.15438.8802.sendpatchset@linux.site> Subject: [patch 1/6] mm: revert "generic_file_buffered_write(): handle zero length iovec segments" Date: Fri, 13 Oct 2006 18:44:02 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1691 Lines: 63 From: Andrew Morton Revert 81b0c8713385ce1b1b9058e916edcf9561ad76d6. This was a bugfix against 6527c2bdf1f833cc18e8f42bd97973d583e4aa83, which we also revert. Signed-off-by: Andrew Morton Index: linux-2.6/mm/filemap.c =================================================================== --- linux-2.6.orig/mm/filemap.c +++ linux-2.6/mm/filemap.c @@ -1912,12 +1912,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); @@ -1947,8 +1941,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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/