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

Commit ab34c02a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (36 commits)
  nilfs2: eliminate sparse warning - "context imbalance"
  nilfs2: eliminate sparse warnings - "symbol not declared"
  nilfs2: get rid of bdi from nilfs object
  nilfs2: change license of exported header file
  nilfs2: add bdev freeze/thaw support
  nilfs2: accept 64-bit checkpoint numbers in cp mount option
  nilfs2: remove own inode allocator and destructor for metadata files
  nilfs2: get rid of back pointer to writable sb instance
  nilfs2: get rid of mi_nilfs back pointer to nilfs object
  nilfs2: see state of root dentry for mount check of snapshots
  nilfs2: use iget for all metadata files
  nilfs2: get rid of GCDAT inode
  nilfs2: add routines to redirect access to buffers of DAT file
  nilfs2: add routines to roll back state of DAT file
  nilfs2: add routines to save and restore bmap state
  nilfs2: do not allocate nilfs_mdt_info structure to gc-inodes
  nilfs2: allow nilfs_clear_inode to clear metadata file inodes
  nilfs2: get rid of snapshot mount flag
  nilfs2: simplify life cycle management of nilfs object
  nilfs2: do not allocate multiple super block instances for a device
  ...
parents 7f388396 6b81e14e

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

+12 −10
Original line number Diff line number Diff line
@@ -533,18 +533,20 @@ 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)

void nilfs_bmap_save(const struct nilfs_bmap *bmap,

		     struct nilfs_bmap_store *store)

{

	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;

	memcpy(store->data, bmap->b_u.u_data, sizeof(store->data));

	store->last_allocated_key = bmap->b_last_allocated_key;

	store->last_allocated_ptr = bmap->b_last_allocated_ptr;

	store->state = bmap->b_state;

}



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

void nilfs_bmap_restore(struct nilfs_bmap *bmap,

			const struct nilfs_bmap_store *store)

{

	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;

	memcpy(bmap->b_u.u_data, store->data, sizeof(store->data));

	bmap->b_last_allocated_key = store->last_allocated_key;

	bmap->b_last_allocated_ptr = store->last_allocated_ptr;

	bmap->b_state = store->state;

}

fs/nilfs2/bmap.h

+8 −2
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ struct nilfs_bmap { 
/* state */

#define NILFS_BMAP_DIRTY	0x00000001



struct nilfs_bmap_store {

	__le64 data[NILFS_BMAP_SIZE / sizeof(__le64)];

	__u64 last_allocated_key;

	__u64 last_allocated_ptr;

	int state;

};



int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *);

int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *);
@@ -153,9 +159,9 @@ 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 *);



static inline int nilfs_bmap_lookup(struct nilfs_bmap *bmap, __u64 key,

				    __u64 *ptr)

fs/nilfs2/btnode.c

+2 −15
Original line number Diff line number Diff line
@@ -37,15 +37,7 @@ 


void nilfs_btnode_cache_init_once(struct address_space *btnc)

{

	memset(btnc, 0, sizeof(*btnc));

	INIT_RADIX_TREE(&btnc->page_tree, GFP_ATOMIC);

	spin_lock_init(&btnc->tree_lock);

	INIT_LIST_HEAD(&btnc->private_list);

	spin_lock_init(&btnc->private_lock);



	spin_lock_init(&btnc->i_mmap_lock);

	INIT_RAW_PRIO_TREE_ROOT(&btnc->i_mmap);

	INIT_LIST_HEAD(&btnc->i_mmap_nonlinear);

	nilfs_mapping_init_once(btnc);

}



static const struct address_space_operations def_btnode_aops = {
@@ -55,12 +47,7 @@ static const struct address_space_operations def_btnode_aops = { 
void nilfs_btnode_cache_init(struct address_space *btnc,

			     struct backing_dev_info *bdi)

{

	btnc->host = NULL;  /* can safely set to host inode ? */

	btnc->flags = 0;

	mapping_set_gfp_mask(btnc, GFP_NOFS);

	btnc->assoc_mapping = NULL;

	btnc->backing_dev_info = bdi;

	btnc->a_ops = &def_btnode_aops;

	nilfs_mapping_init(btnc, bdi, &def_btnode_aops);

}



void nilfs_btnode_cache_clear(struct address_space *btnc)

fs/nilfs2/cpfile.c

+39 −33
Original line number Diff line number Diff line
@@ -863,26 +863,19 @@ int nilfs_cpfile_is_snapshot(struct inode *cpfile, __u64 cno) 
 */

int nilfs_cpfile_change_cpmode(struct inode *cpfile, __u64 cno, int mode)

{

	struct the_nilfs *nilfs;

	int ret;



	nilfs = NILFS_MDT(cpfile)->mi_nilfs;



	switch (mode) {

	case NILFS_CHECKPOINT:

		if (nilfs_checkpoint_is_mounted(cpfile->i_sb, cno))

			/*

		 * Check for protecting existing snapshot mounts:

		 * ns_mount_mutex is used to make this operation atomic and

		 * exclusive with a new mount job.  Though it doesn't cover

		 * umount, it's enough for the purpose.

			 * Current implementation does not have to protect

			 * plain read-only mounts since they are exclusive

			 * with a read/write mount and are protected from the

			 * cleaner.

			 */

		if (nilfs_checkpoint_is_mounted(nilfs, cno, 1)) {

			/* Current implementation does not have to protect

			   plain read-only mounts since they are exclusive

			   with a read/write mount and are protected from the

			   cleaner. */

			ret = -EBUSY;

		} else

		else

			ret = nilfs_cpfile_clear_snapshot(cpfile, cno);

		return ret;

	case NILFS_SNAPSHOT:
@@ -933,27 +926,40 @@ int nilfs_cpfile_get_stat(struct inode *cpfile, struct nilfs_cpstat *cpstat) 
}



/**

 * nilfs_cpfile_read - read cpfile inode

 * @cpfile: cpfile inode

 * @raw_inode: on-disk cpfile inode

 */

int nilfs_cpfile_read(struct inode *cpfile, struct nilfs_inode *raw_inode)

{

	return nilfs_read_inode_common(cpfile, raw_inode);

}



/**

 * nilfs_cpfile_new - create cpfile

 * @nilfs: nilfs object

 * nilfs_cpfile_read - read or get cpfile inode

 * @sb: super block instance

 * @cpsize: size of a checkpoint entry

 * @raw_inode: on-disk cpfile inode

 * @inodep: buffer to store the inode

 */

struct inode *nilfs_cpfile_new(struct the_nilfs *nilfs, size_t cpsize)

int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,

		      struct nilfs_inode *raw_inode, struct inode **inodep)

{

	struct inode *cpfile;

	int err;



	cpfile = nilfs_iget_locked(sb, NULL, NILFS_CPFILE_INO);

	if (unlikely(!cpfile))

		return -ENOMEM;

	if (!(cpfile->i_state & I_NEW))

		goto out;



	err = nilfs_mdt_init(cpfile, NILFS_MDT_GFP, 0);

	if (err)

		goto failed;



	cpfile = nilfs_mdt_new(nilfs, NULL, NILFS_CPFILE_INO, 0);

	if (cpfile)

	nilfs_mdt_set_entry_size(cpfile, cpsize,

				 sizeof(struct nilfs_cpfile_header));

	return cpfile;



	err = nilfs_read_inode_common(cpfile, raw_inode);

	if (err)

		goto failed;



	unlock_new_inode(cpfile);

 out:

	*inodep = cpfile;

	return 0;

 failed:

	iget_failed(cpfile);

	return err;

}