Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01ba6875 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

jffs2: move jffs2_write_super to super.c 



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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4aa98cf7

fs/jffs2/fs.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -402,21 +402,6 @@ int jffs2_remount_fs (struct super_block *sb, int *flags, char *data) 
	return 0;

	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,

/* jffs2_new_inode: allocate a new inode and inocache, add it to the hash,

   fill in the raw_inode while you're at it. */

   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)

struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_inode *ri)

fs/jffs2/os-linux.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,6 @@ void jffs2_dirty_inode(struct inode *inode); 
struct inode *jffs2_new_inode (struct inode *dir_i, int mode,

struct inode *jffs2_new_inode (struct inode *dir_i, int mode,

			       struct jffs2_raw_inode *ri);

			       struct jffs2_raw_inode *ri);

int jffs2_statfs (struct dentry *, struct kstatfs *);

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_remount_fs (struct super_block *, int *, char *);

int jffs2_do_fill_super(struct super_block *sb, void *data, int silent);

int jffs2_do_fill_super(struct super_block *sb, void *data, int silent);

void jffs2_gc_release_inode(struct jffs2_sb_info *c,

void jffs2_gc_release_inode(struct jffs2_sb_info *c,

fs/jffs2/super.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,20 @@ static void jffs2_i_init_once(void *foo) 
	inode_init_once(&f->vfs_inode);

	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)

static int jffs2_sync_fs(struct super_block *sb, int wait)

{

{

	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);

	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);