From patchwork Fri Jun 5 13:05:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 28146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8C48BB707B for ; Fri, 5 Jun 2009 21:21:34 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MCXQn-0004Tu-5t; Fri, 05 Jun 2009 11:17:53 +0000 Received: from smtp.nokia.com ([192.100.122.230] helo=mgw-mx03.nokia.com) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MCXN6-00085J-1b; Fri, 05 Jun 2009 11:14:12 +0000 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n55BDgB7020741; Fri, 5 Jun 2009 14:13:52 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 5 Jun 2009 14:13:14 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 5 Jun 2009 14:13:05 +0300 Received: from localhost.localdomain (esdhcp04227.research.nokia.com [172.21.42.27]) by mgw-da02.ext.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n55BCaHv021873; Fri, 5 Jun 2009 14:12:59 +0300 From: Artem Bityutskiy To: Al Viro Subject: [PATCH v2.1 10/17] JFFS2: do not manipulate s_dirt directly Date: Fri, 5 Jun 2009 16:05:48 +0300 Message-Id: <1244207155-2092-11-git-send-email-dedekind@infradead.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1244207155-2092-1-git-send-email-dedekind@infradead.org> References: <1244207155-2092-1-git-send-email-dedekind@infradead.org> X-OriginalArrivalTime: 05 Jun 2009 11:13:05.0603 (UTC) FILETIME=[99607930:01C9E5CE] X-Nokia-AV: Clean X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -4.0 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [192.100.122.230 listed in list.dnswl.org] X-Mailman-Approved-At: Fri, 05 Jun 2009 07:17:47 -0400 Cc: Artem Bityutskiy , linux-kernel@vger.kernel.org, Christoph Hellwig , linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, David Woodhouse X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Artem Bityutskiy ... use new VFS helpers instead. Signed-off-by: Artem Bityutskiy Cc: David Woodhouse Cc: linux-mtd@lists.infradead.org Acked-by: David Woodhouse --- fs/jffs2/os-linux.h | 2 +- fs/jffs2/super.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index 2228380..ad12212 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -147,7 +147,7 @@ void jffs2_nor_wbuf_flash_cleanup(struct jffs2_sb_info *c); /* erase.c */ static inline void jffs2_erase_pending_trigger(struct jffs2_sb_info *c) { - OFNI_BS_2SFFJ(c)->s_dirt = 1; + mark_sb_dirty(OFNI_BS_2SFFJ(c)); } /* background.c */ diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index f7bfd3a..5b321fa 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -58,7 +58,7 @@ static void jffs2_write_super(struct super_block *sb) struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); lock_super(sb); - sb->s_dirt = 0; + mark_sb_clean(sb); if (!(sb->s_flags & MS_RDONLY)) { D1(printk(KERN_DEBUG "jffs2_write_super()\n")); @@ -193,7 +193,7 @@ static void jffs2_put_super (struct super_block *sb) lock_kernel(); - if (sb->s_dirt) + if (is_sb_dirty(sb)) jffs2_write_super(sb); mutex_lock(&c->alloc_sem);