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

Commit c1c1d709 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: get rid of GCDAT inode 



This applies prepared rollback function and redirect function of
metadata file to DAT file, and eliminates GCDAT inode.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent b1f6a4f2

fs/nilfs2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ obj-$(CONFIG_NILFS2_FS) += nilfs2.o 
nilfs2-y := inode.o file.o dir.o super.o namei.o page.o mdt.o \

	btnode.o bmap.o btree.o direct.o dat.o recovery.o \

	the_nilfs.o segbuf.o segment.o cpfile.o sufile.o \

	ifile.o alloc.o gcinode.o ioctl.o gcdat.o
 
	ifile.o alloc.o gcinode.o ioctl.o

fs/nilfs2/bmap.c

+0 −16
Original line number Diff line number Diff line
@@ -533,22 +533,6 @@ void nilfs_bmap_init_gc(struct nilfs_bmap *bmap) 
	nilfs_btree_init_gc(bmap);

}



void nilfs_bmap_init_gcdat(struct nilfs_bmap *gcbmap, struct nilfs_bmap *bmap)

{

	memcpy(gcbmap, bmap, sizeof(*bmap));

	init_rwsem(&gcbmap->b_sem);

	lockdep_set_class(&bmap->b_sem, &nilfs_bmap_dat_lock_key);

	gcbmap->b_inode = &NILFS_BMAP_I(gcbmap)->vfs_inode;

}



void nilfs_bmap_commit_gcdat(struct nilfs_bmap *gcbmap, struct nilfs_bmap *bmap)

{

	memcpy(bmap, gcbmap, sizeof(*bmap));

	init_rwsem(&bmap->b_sem);

	lockdep_set_class(&bmap->b_sem, &nilfs_bmap_dat_lock_key);

	bmap->b_inode = &NILFS_BMAP_I(bmap)->vfs_inode;

}



void nilfs_bmap_save(const struct nilfs_bmap *bmap,

		     struct nilfs_bmap_store *store)

{

fs/nilfs2/bmap.h

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ int nilfs_bmap_lookup_at_level(struct nilfs_bmap *, __u64, int, __u64 *); 
int nilfs_bmap_mark(struct nilfs_bmap *, __u64, int);



void nilfs_bmap_init_gc(struct nilfs_bmap *);

void nilfs_bmap_init_gcdat(struct nilfs_bmap *, struct nilfs_bmap *);

void nilfs_bmap_commit_gcdat(struct nilfs_bmap *, struct nilfs_bmap *);



void nilfs_bmap_save(const struct nilfs_bmap *, struct nilfs_bmap_store *);

void nilfs_bmap_restore(struct nilfs_bmap *, const struct nilfs_bmap_store *);

fs/nilfs2/dat.c

+29 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
struct nilfs_dat_info {

	struct nilfs_mdt_info mi;

	struct nilfs_palloc_cache palloc_cache;

	struct nilfs_shadow_map shadow;

};



static inline struct nilfs_dat_info *NILFS_DAT_I(struct inode *dat)
@@ -327,6 +328,23 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr) 
	ret = nilfs_palloc_get_entry_block(dat, vblocknr, 0, &entry_bh);

	if (ret < 0)

		return ret;



	/*

	 * The given disk block number (blocknr) is not yet written to

	 * the device at this point.

	 *

	 * To prevent nilfs_dat_translate() from returning the

	 * uncommited block number, this makes a copy of the entry

	 * buffer and redirects nilfs_dat_translate() to the copy.

	 */

	if (!buffer_nilfs_redirected(entry_bh)) {

		ret = nilfs_mdt_freeze_buffer(dat, entry_bh);

		if (ret) {

			brelse(entry_bh);

			return ret;

		}

	}



	kaddr = kmap_atomic(entry_bh->b_page, KM_USER0);

	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);

	if (unlikely(entry->de_blocknr == cpu_to_le64(0))) {
@@ -371,7 +389,7 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr) 
 */

int nilfs_dat_translate(struct inode *dat, __u64 vblocknr, sector_t *blocknrp)

{

	struct buffer_head *entry_bh;

	struct buffer_head *entry_bh, *bh;

	struct nilfs_dat_entry *entry;

	sector_t blocknr;

	void *kaddr;
@@ -381,6 +399,15 @@ int nilfs_dat_translate(struct inode *dat, __u64 vblocknr, sector_t *blocknrp) 
	if (ret < 0)

		return ret;



	if (!nilfs_doing_gc() && buffer_nilfs_redirected(entry_bh)) {

		bh = nilfs_mdt_get_frozen_buffer(dat, entry_bh);

		if (bh) {

			WARN_ON(!buffer_uptodate(bh));

			brelse(entry_bh);

			entry_bh = bh;

		}

	}



	kaddr = kmap_atomic(entry_bh->b_page, KM_USER0);

	entry = nilfs_palloc_block_get_entry(dat, vblocknr, entry_bh, kaddr);

	blocknr = le64_to_cpu(entry->de_blocknr);
@@ -468,6 +495,7 @@ struct inode *nilfs_dat_new(struct the_nilfs *nilfs, size_t entry_size) 
		di = NILFS_DAT_I(dat);

		lockdep_set_class(&di->mi.mi_sem, &dat_lock_key);

		nilfs_palloc_setup_cache(dat, &di->palloc_cache);

		nilfs_mdt_setup_shadow_map(dat, &di->shadow);

	}

	return dat;

}

fs/nilfs2/gcdat.c

deleted100644 → 0
+0 −87
Original line number Diff line number Diff line 
/*

 * gcdat.c - NILFS shadow DAT inode for GC

 *

 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 *

 * Written by Seiji Kihara <kihara@osrg.net>, Amagai Yoshiji <amagai@osrg.net>,

 *            and Ryusuke Konishi <ryusuke@osrg.net>.

 *

 */



#include <linux/buffer_head.h>

#include "nilfs.h"

#include "page.h"

#include "mdt.h"



int nilfs_init_gcdat_inode(struct the_nilfs *nilfs)

{

	struct inode *dat = nilfs->ns_dat, *gcdat = nilfs->ns_gc_dat;

	struct nilfs_inode_info *dii = NILFS_I(dat), *gii = NILFS_I(gcdat);

	int err;



	gcdat->i_state = 0;

	gcdat->i_blocks = dat->i_blocks;

	gii->i_flags = dii->i_flags;

	gii->i_state = dii->i_state | (1 << NILFS_I_GCDAT);

	gii->i_cno = 0;

	nilfs_bmap_init_gcdat(gii->i_bmap, dii->i_bmap);

	err = nilfs_copy_dirty_pages(gcdat->i_mapping, dat->i_mapping);

	if (unlikely(err))

		return err;



	return nilfs_copy_dirty_pages(&gii->i_btnode_cache,

				      &dii->i_btnode_cache);

}



void nilfs_commit_gcdat_inode(struct the_nilfs *nilfs)

{

	struct inode *dat = nilfs->ns_dat, *gcdat = nilfs->ns_gc_dat;

	struct nilfs_inode_info *dii = NILFS_I(dat), *gii = NILFS_I(gcdat);

	struct address_space *mapping = dat->i_mapping;

	struct address_space *gmapping = gcdat->i_mapping;



	down_write(&NILFS_MDT(dat)->mi_sem);

	dat->i_blocks = gcdat->i_blocks;

	dii->i_flags = gii->i_flags;

	dii->i_state = gii->i_state & ~(1 << NILFS_I_GCDAT);



	nilfs_bmap_commit_gcdat(gii->i_bmap, dii->i_bmap);



	nilfs_palloc_clear_cache(dat);

	nilfs_palloc_clear_cache(gcdat);

	nilfs_clear_dirty_pages(mapping);

	nilfs_copy_back_pages(mapping, gmapping);

	/* note: mdt dirty flags should be cleared by segctor. */



	nilfs_clear_dirty_pages(&dii->i_btnode_cache);

	nilfs_copy_back_pages(&dii->i_btnode_cache, &gii->i_btnode_cache);



	up_write(&NILFS_MDT(dat)->mi_sem);

}



void nilfs_clear_gcdat_inode(struct the_nilfs *nilfs)

{

	struct inode *gcdat = nilfs->ns_gc_dat;

	struct nilfs_inode_info *gii = NILFS_I(gcdat);



	gcdat->i_state = I_FREEING | I_CLEAR;

	gii->i_flags = 0;



	nilfs_palloc_clear_cache(gcdat);

	truncate_inode_pages(gcdat->i_mapping, 0);

	truncate_inode_pages(&gii->i_btnode_cache, 0);

}