From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 1/2] jffs2: move jffs2_write_super to super.c Date: Mon, 11 May 2009 23:34:27 +0200 Message-ID: <20090511213427.GA19326@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org To: viro@zeniv.linux.org.uk, dwmw2@infradead.org Return-path: Received: from verein.lst.de ([213.95.11.210]:39049 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753738AbZEKVem (ORCPT ); Mon, 11 May 2009 17:34:42 -0400 Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: jffs2_write_super is only called from super.c and doesn't use any functionality from fs.c. So move it over to super.c and make it static there. [should go in through the vfs tree as it is a requirement for the next patch] Signed-off-by: Christoph Hellwig Index: vfs-2.6/fs/jffs2/fs.c =================================================================== --- vfs-2.6.orig/fs/jffs2/fs.c 2009-05-11 21:49:27.468659418 +0200 +++ vfs-2.6/fs/jffs2/fs.c 2009-05-11 21:49:47.015661331 +0200 @@ -402,21 +402,6 @@ int jffs2_remount_fs (struct super_block return 0; } -void jffs2_write_super (struct super_block *sb) -{ - struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); - sb->s_dirt = 0; - - if (sb->s_flags & MS_RDONLY) - return; - - D1(printk(KERN_DEBUG "jffs2_write_super()\n")); - jffs2_garbage_collect_trigger(c); - jffs2_erase_pending_blocks(c, 0); - jffs2_flush_wbuf_gc(c, 0); -} - - /* jffs2_new_inode: allocate a new inode and inocache, add it to the hash, fill in the raw_inode while you're at it. */ struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_inode *ri) Index: vfs-2.6/fs/jffs2/os-linux.h =================================================================== --- vfs-2.6.orig/fs/jffs2/os-linux.h 2009-05-11 21:49:27.442684115 +0200 +++ vfs-2.6/fs/jffs2/os-linux.h 2009-05-11 21:49:31.144661207 +0200 @@ -181,7 +181,6 @@ void jffs2_dirty_inode(struct inode *ino struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_inode *ri); int jffs2_statfs (struct dentry *, struct kstatfs *); -void jffs2_write_super (struct super_block *); int jffs2_remount_fs (struct super_block *, int *, char *); int jffs2_do_fill_super(struct super_block *sb, void *data, int silent); void jffs2_gc_release_inode(struct jffs2_sb_info *c, Index: vfs-2.6/fs/jffs2/super.c =================================================================== --- vfs-2.6.orig/fs/jffs2/super.c 2009-05-11 21:49:27.542659968 +0200 +++ vfs-2.6/fs/jffs2/super.c 2009-05-11 23:31:54.954659723 +0200 @@ -53,6 +53,20 @@ static void jffs2_i_init_once(void *foo) inode_init_once(&f->vfs_inode); } +static void jffs2_write_super(struct super_block *sb) +{ + struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); + sb->s_dirt = 0; + + if (sb->s_flags & MS_RDONLY) + return; + + D1(printk(KERN_DEBUG "jffs2_write_super()\n")); + jffs2_garbage_collect_trigger(c); + jffs2_erase_pending_blocks(c, 0); + jffs2_flush_wbuf_gc(c, 0); +} + static int jffs2_sync_fs(struct super_block *sb, int wait) { struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);