From patchwork Wed Dec 7 05:21:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 129915 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 26E311007D2 for ; Wed, 7 Dec 2011 19:23:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754140Ab1LGIX4 (ORCPT ); Wed, 7 Dec 2011 03:23:56 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:43508 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078Ab1LGIX4 (ORCPT ); Wed, 7 Dec 2011 03:23:56 -0500 Received: by ghbz2 with SMTP id z2so248849ghb.19 for ; Wed, 07 Dec 2011 00:23:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=73OIk0BX6Mp4QceXMrxbd1HBaJK0W03TzMobQ6lcSl0=; b=PDranC4QB0VppAdgQlePgny721sVD7CWZyPPFl36kMDuCubBmaEn0yS4HRwYch/p8q YUuSiSjRK2753KPlmmhnqnw64RbuZcPj17O1vhxcHZW006nF77enArY1l95y62pn1mrS psa+KNZGaHKcZc0HNnIQs4a44FvCg6F0Thi88= Received: by 10.50.17.168 with SMTP id p8mr18767548igd.20.1323246235824; Wed, 07 Dec 2011 00:23:55 -0800 (PST) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id jm11sm4124612ibb.1.2011.12.07.00.23.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Dec 2011 00:23:55 -0800 (PST) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: achender@linux.vnet.ibm.com, hughd@google.com, tytso@mit.edu, Yongqiang Yang Subject: [PATCH 2/2] ext4: let ext4_bio_write_page handle EOF correctly Date: Wed, 7 Dec 2011 13:21:27 +0800 Message-Id: <1323235287-29806-2-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1323235287-29806-1-git-send-email-xiaoqiangnk@gmail.com> References: <1323235287-29806-1-git-send-email-xiaoqiangnk@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org We need to zero out part of a page which beyond EOF before setting uptodate, otherwise, mapread or write will see non-zero data beyond EOF. Signed-off-by: Yongqiang Yang --- fs/ext4/page-io.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 235b79d..9e145b8 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -385,6 +385,18 @@ int ext4_bio_write_page(struct ext4_io_submit *io, block_end = block_start + blocksize; if (block_start >= len) { + /* + * Comments copied from block_write_full_page_endio: + * + * The page straddles i_size. It must be zeroed out on + * each and every writepage invocation because it may + * be mmapped. "A file is mapped in multiples of the + * page size. For a file that is not a multiple of + * the page size, the remaining memory is zeroed when + * mapped, and writes to that region are not written + * out to the file." + */ + zero_user_segment(page, block_start, block_end); clear_buffer_dirty(bh); set_buffer_uptodate(bh); continue;