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

Commit 5bab188a 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: move NILFS_SUPER_MAGIC to linux/magic.h
  nilfs2: get rid of nilfs_sb_info structure
  nilfs2: use sb instance instead of nilfs_sb_info struct
  nilfs2: get rid of sc_sbi back pointer
  nilfs2: move log writer onto nilfs object
  nilfs2: move next generation counter into nilfs object
  nilfs2: move s_inode_lock and s_dirty_files into nilfs object
  nilfs2: move parameters on nilfs_sb_info into nilfs object
  nilfs2: move mount options to nilfs object
  nilfs2: record used amount of each checkpoint in checkpoint list
  nilfs2: optimize rec_len functions
  nilfs2: append blocksize info to warnings during loading super blocks
  nilfs2: add compat ioctl
  nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION
  nilfs2: tighten restrictions on inode flags
  nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set
  nilfs2: use common file attribute macros
  nilfs2: add free entries count only if clear bit operation succeeded
  nilfs2: decrement inodes count only if raw inode was successfully deleted
parents a8c91da5 4d3cf1bc

fs/nilfs2/alloc.c

+7 −5
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, 
				    group_offset, bitmap))

		printk(KERN_WARNING "%s: entry number %llu already freed\n",

		       __func__, (unsigned long long)req->pr_entry_nr);



	else

		nilfs_palloc_group_desc_add_entries(inode, group, desc, 1);



	kunmap(req->pr_bitmap_bh->b_page);
@@ -558,7 +558,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, 
				    group_offset, bitmap))

		printk(KERN_WARNING "%s: entry number %llu already freed\n",

		       __func__, (unsigned long long)req->pr_entry_nr);



	else

		nilfs_palloc_group_desc_add_entries(inode, group, desc, 1);



	kunmap(req->pr_bitmap_bh->b_page);
@@ -665,7 +665,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
		for (j = i, n = 0;

		     (j < nitems) && nilfs_palloc_group_is_in(inode, group,

							      entry_nrs[j]);

		     j++, n++) {

		     j++) {

			nilfs_palloc_group(inode, entry_nrs[j], &group_offset);

			if (!nilfs_clear_bit_atomic(

				    nilfs_mdt_bgl_lock(inode, group),
@@ -674,6 +674,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
				       "%s: entry number %llu already freed\n",

				       __func__,

				       (unsigned long long)entry_nrs[j]);

			} else {

				n++;

			}

		}

		nilfs_palloc_group_desc_add_entries(inode, group, desc, n);

fs/nilfs2/bmap.c

+0 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/errno.h>

#include "nilfs.h"

#include "bmap.h"

#include "sb.h"

#include "btree.h"

#include "direct.h"

#include "btnode.h"
@@ -425,17 +424,6 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *bmap) 
/*

 * Internal use only

 */



void nilfs_bmap_add_blocks(const struct nilfs_bmap *bmap, int n)

{

	inode_add_bytes(bmap->b_inode, (1 << bmap->b_inode->i_blkbits) * n);

}



void nilfs_bmap_sub_blocks(const struct nilfs_bmap *bmap, int n)

{

	inode_sub_bytes(bmap->b_inode, (1 << bmap->b_inode->i_blkbits) * n);

}



__u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,

			      const struct buffer_head *bh)

{

fs/nilfs2/bmap.h

+0 −3
Original line number Diff line number Diff line
@@ -240,9 +240,6 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *, 
__u64 nilfs_bmap_find_target_seq(const struct nilfs_bmap *, __u64);

__u64 nilfs_bmap_find_target_in_group(const struct nilfs_bmap *);



void nilfs_bmap_add_blocks(const struct nilfs_bmap *, int);

void nilfs_bmap_sub_blocks(const struct nilfs_bmap *, int);





/* Assume that bmap semaphore is locked. */

static inline int nilfs_bmap_dirty(const struct nilfs_bmap *bmap)

fs/nilfs2/btree.c

+3 −3
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static int nilfs_btree_insert(struct nilfs_bmap *btree, __u64 key, __u64 ptr) 
	if (ret < 0)

		goto out;

	nilfs_btree_commit_insert(btree, path, level, key, ptr);

	nilfs_bmap_add_blocks(btree, stats.bs_nblocks);

	nilfs_inode_add_blocks(btree->b_inode, stats.bs_nblocks);



 out:

	nilfs_btree_free_path(path);
@@ -1511,7 +1511,7 @@ static int nilfs_btree_delete(struct nilfs_bmap *btree, __u64 key) 
	if (ret < 0)

		goto out;

	nilfs_btree_commit_delete(btree, path, level, dat);

	nilfs_bmap_sub_blocks(btree, stats.bs_nblocks);

	nilfs_inode_sub_blocks(btree->b_inode, stats.bs_nblocks);



out:

	nilfs_btree_free_path(path);
@@ -1776,7 +1776,7 @@ int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree, 
		return ret;

	nilfs_btree_commit_convert_and_insert(btree, key, ptr, keys, ptrs, n,

					      di, ni, bh);

	nilfs_bmap_add_blocks(btree, stats.bs_nblocks);

	nilfs_inode_add_blocks(btree->b_inode, stats.bs_nblocks);

	return 0;

}

fs/nilfs2/dir.c

+1 −4
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de, 
	nilfs_commit_chunk(page, mapping, from, to);

	nilfs_put_page(page);

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

/*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */

}



/*
@@ -531,7 +530,6 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) 
	nilfs_set_de_type(de, inode);

	nilfs_commit_chunk(page, page->mapping, from, to);

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

/*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */

	nilfs_mark_inode_dirty(dir);

	/* OFFSET_CACHE */

out_put:
@@ -579,7 +577,6 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) 
	dir->inode = 0;

	nilfs_commit_chunk(page, mapping, from, to);

	inode->i_ctime = inode->i_mtime = CURRENT_TIME;

/*	NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */

out:

	nilfs_put_page(page);

	return err;
@@ -684,7 +681,7 @@ const struct file_operations nilfs_dir_operations = { 
	.readdir	= nilfs_readdir,

	.unlocked_ioctl	= nilfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= nilfs_ioctl,

	.compat_ioctl	= nilfs_compat_ioctl,

#endif	/* CONFIG_COMPAT */

	.fsync		= nilfs_sync_file,