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

Commit caebc160 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:
  nilfs2: use mark_buffer_dirty to mark btnode or meta data dirty
  nilfs2: always set back pointer to host inode in mapping->host
  nilfs2: get rid of NILFS_I_NILFS
  nilfs2: use list_first_entry
  nilfs2: use empty_aops for gc-inodes
  nilfs2: implement resize ioctl
  nilfs2: add truncation routine of segment usage file
  nilfs2: add routine to move secondary super block
  nilfs2: add ioctl which limits range of segment to be allocated
  nilfs2: zero fill unused portion of super root block
  nilfs2: super root size should change depending on inode size
  nilfs2: get rid of private page allocator
  nilfs2: merge list_del()/list_add_tail() to list_move_tail()
parents d798f7f0 5fc7b141

fs/nilfs2/alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -489,8 +489,8 @@ int nilfs_palloc_prepare_alloc_entry(struct inode *inode, 
void nilfs_palloc_commit_alloc_entry(struct inode *inode,

				     struct nilfs_palloc_req *req)

{

	nilfs_mdt_mark_buffer_dirty(req->pr_bitmap_bh);

	nilfs_mdt_mark_buffer_dirty(req->pr_desc_bh);

	mark_buffer_dirty(req->pr_bitmap_bh);

	mark_buffer_dirty(req->pr_desc_bh);

	nilfs_mdt_mark_dirty(inode);



	brelse(req->pr_bitmap_bh);
@@ -527,8 +527,8 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, 
	kunmap(req->pr_bitmap_bh->b_page);

	kunmap(req->pr_desc_bh->b_page);



	nilfs_mdt_mark_buffer_dirty(req->pr_desc_bh);

	nilfs_mdt_mark_buffer_dirty(req->pr_bitmap_bh);

	mark_buffer_dirty(req->pr_desc_bh);

	mark_buffer_dirty(req->pr_bitmap_bh);

	nilfs_mdt_mark_dirty(inode);



	brelse(req->pr_bitmap_bh);
@@ -683,8 +683,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		kunmap(bitmap_bh->b_page);

		kunmap(desc_bh->b_page);



		nilfs_mdt_mark_buffer_dirty(desc_bh);

		nilfs_mdt_mark_buffer_dirty(bitmap_bh);

		mark_buffer_dirty(desc_bh);

		mark_buffer_dirty(bitmap_bh);

		nilfs_mdt_mark_dirty(inode);



		brelse(bitmap_bh);

fs/nilfs2/bmap.c

+3 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ 


struct inode *nilfs_bmap_get_dat(const struct nilfs_bmap *bmap)

{

	return NILFS_I_NILFS(bmap->b_inode)->ns_dat;

	struct the_nilfs *nilfs = bmap->b_inode->i_sb->s_fs_info;



	return nilfs->ns_dat;

}



static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap,

fs/nilfs2/btnode.c

+7 −12
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 
#include "page.h"

#include "btnode.h"



void nilfs_btnode_cache_init(struct address_space *btnc,

			     struct backing_dev_info *bdi)

{

	nilfs_mapping_init(btnc, bdi);

}



void nilfs_btnode_cache_clear(struct address_space *btnc)

{

	invalidate_mapping_pages(btnc, 0, -1);
@@ -62,7 +56,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
		BUG();

	}

	memset(bh->b_data, 0, 1 << inode->i_blkbits);

	bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = blocknr;

	set_buffer_mapped(bh);

	set_buffer_uptodate(bh);
@@ -94,10 +88,11 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
	if (pblocknr == 0) {

		pblocknr = blocknr;

		if (inode->i_ino != NILFS_DAT_INO) {

			struct inode *dat = NILFS_I_NILFS(inode)->ns_dat;

			struct the_nilfs *nilfs = inode->i_sb->s_fs_info;



			/* blocknr is a virtual block number */

			err = nilfs_dat_translate(dat, blocknr, &pblocknr);

			err = nilfs_dat_translate(nilfs->ns_dat, blocknr,

						  &pblocknr);

			if (unlikely(err)) {

				brelse(bh);

				goto out_locked;
@@ -120,7 +115,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
		goto found;

	}

	set_buffer_mapped(bh);

	bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = pblocknr; /* set block address for read */

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);
@@ -259,7 +254,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc, 
				       "invalid oldkey %lld (newkey=%lld)",

				       (unsigned long long)oldkey,

				       (unsigned long long)newkey);

		nilfs_btnode_mark_dirty(obh);

		mark_buffer_dirty(obh);



		spin_lock_irq(&btnc->tree_lock);

		radix_tree_delete(&btnc->page_tree, oldkey);
@@ -271,7 +266,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc, 
		unlock_page(opage);

	} else {

		nilfs_copy_buffer(nbh, obh);

		nilfs_btnode_mark_dirty(nbh);

		mark_buffer_dirty(nbh);



		nbh->b_blocknr = newkey;

		ctxt->bh = nbh;

fs/nilfs2/btnode.h

+0 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct nilfs_btnode_chkey_ctxt { 
	struct buffer_head *newbh;

};



void nilfs_btnode_cache_init(struct address_space *, struct backing_dev_info *);

void nilfs_btnode_cache_clear(struct address_space *);

struct buffer_head *nilfs_btnode_create_block(struct address_space *btnc,

					      __u64 blocknr);
@@ -51,7 +50,4 @@ void nilfs_btnode_commit_change_key(struct address_space *, 
void nilfs_btnode_abort_change_key(struct address_space *,

				   struct nilfs_btnode_chkey_ctxt *);



#define nilfs_btnode_mark_dirty(bh)	nilfs_mark_buffer_dirty(bh)





#endif	/* _NILFS_BTNODE_H */

fs/nilfs2/btree.c

+19 −19
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void nilfs_btree_promote_key(struct nilfs_bmap *btree, 
				nilfs_btree_get_nonroot_node(path, level),

				path[level].bp_index, key);

			if (!buffer_dirty(path[level].bp_bh))

				nilfs_btnode_mark_dirty(path[level].bp_bh);

				mark_buffer_dirty(path[level].bp_bh);

		} while ((path[level].bp_index == 0) &&

			 (++level < nilfs_btree_height(btree) - 1));

	}
@@ -739,7 +739,7 @@ static void nilfs_btree_do_insert(struct nilfs_bmap *btree, 
		nilfs_btree_node_insert(node, path[level].bp_index,

					*keyp, *ptrp, ncblk);

		if (!buffer_dirty(path[level].bp_bh))

			nilfs_btnode_mark_dirty(path[level].bp_bh);

			mark_buffer_dirty(path[level].bp_bh);



		if (path[level].bp_index == 0)

			nilfs_btree_promote_key(btree, path, level + 1,
@@ -777,9 +777,9 @@ static void nilfs_btree_carry_left(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_left(left, node, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);

	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	nilfs_btree_promote_key(btree, path, level + 1,

				nilfs_btree_node_get_key(node, 0));
@@ -823,9 +823,9 @@ static void nilfs_btree_carry_right(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_right(node, right, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);

	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	path[level + 1].bp_index++;

	nilfs_btree_promote_key(btree, path, level + 1,
@@ -870,9 +870,9 @@ static void nilfs_btree_split(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_right(node, right, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);

	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	newkey = nilfs_btree_node_get_key(right, 0);

	newptr = path[level].bp_newreq.bpr_ptr;
@@ -919,7 +919,7 @@ static void nilfs_btree_grow(struct nilfs_bmap *btree, 
	nilfs_btree_node_set_level(root, level + 1);



	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	path[level].bp_bh = path[level].bp_sib_bh;

	path[level].bp_sib_bh = NULL;
@@ -1194,7 +1194,7 @@ static void nilfs_btree_do_delete(struct nilfs_bmap *btree, 
		nilfs_btree_node_delete(node, path[level].bp_index,

					keyp, ptrp, ncblk);

		if (!buffer_dirty(path[level].bp_bh))

			nilfs_btnode_mark_dirty(path[level].bp_bh);

			mark_buffer_dirty(path[level].bp_bh);

		if (path[level].bp_index == 0)

			nilfs_btree_promote_key(btree, path, level + 1,

				nilfs_btree_node_get_key(node, 0));
@@ -1226,9 +1226,9 @@ static void nilfs_btree_borrow_left(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_right(left, node, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);

	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	nilfs_btree_promote_key(btree, path, level + 1,

				nilfs_btree_node_get_key(node, 0));
@@ -1258,9 +1258,9 @@ static void nilfs_btree_borrow_right(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_left(node, right, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);

	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	path[level + 1].bp_index++;

	nilfs_btree_promote_key(btree, path, level + 1,
@@ -1289,7 +1289,7 @@ static void nilfs_btree_concat_left(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_left(left, node, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_sib_bh))

		nilfs_btnode_mark_dirty(path[level].bp_sib_bh);

		mark_buffer_dirty(path[level].bp_sib_bh);



	nilfs_btnode_delete(path[level].bp_bh);

	path[level].bp_bh = path[level].bp_sib_bh;
@@ -1315,7 +1315,7 @@ static void nilfs_btree_concat_right(struct nilfs_bmap *btree, 
	nilfs_btree_node_move_left(node, right, n, ncblk, ncblk);



	if (!buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);



	nilfs_btnode_delete(path[level].bp_sib_bh);

	path[level].bp_sib_bh = NULL;
@@ -1709,7 +1709,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree, 
		nilfs_btree_node_init(node, 0, 1, n, ncblk, keys, ptrs);

		nilfs_btree_node_insert(node, n, key, dreq->bpr_ptr, ncblk);

		if (!buffer_dirty(bh))

			nilfs_btnode_mark_dirty(bh);

			mark_buffer_dirty(bh);

		if (!nilfs_bmap_dirty(btree))

			nilfs_bmap_set_dirty(btree);
@@ -1787,7 +1787,7 @@ static int nilfs_btree_propagate_p(struct nilfs_bmap *btree, 
{

	while ((++level < nilfs_btree_height(btree) - 1) &&

	       !buffer_dirty(path[level].bp_bh))

		nilfs_btnode_mark_dirty(path[level].bp_bh);

		mark_buffer_dirty(path[level].bp_bh);



	return 0;

}
@@ -2229,7 +2229,7 @@ static int nilfs_btree_mark(struct nilfs_bmap *btree, __u64 key, int level) 
	}



	if (!buffer_dirty(bh))

		nilfs_btnode_mark_dirty(bh);

		mark_buffer_dirty(bh);

	brelse(bh);

	if (!nilfs_bmap_dirty(btree))

		nilfs_bmap_set_dirty(btree);