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

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

nilfs2: get rid of nilfs_sb_info structure 



This directly uses sb->s_fs_info to keep a nilfs filesystem object and
fully removes the intermediate nilfs_sb_info structure.  With this
change, the hierarchy of on-memory structures of nilfs will be
simplified as follows:

Before:
  super_block
       -> nilfs_sb_info
             -> the_nilfs
                   -> cptree --+-> nilfs_root (current file system)
                               +-> nilfs_root (snapshot A)
                               +-> nilfs_root (snapshot B)
                               :
             -> nilfs_sc_info (log writer structure)
After:
  super_block
       -> the_nilfs
             -> cptree --+-> nilfs_root (current file system)
                         +-> nilfs_root (snapshot A)
                         +-> nilfs_root (snapshot B)
                         :
             -> nilfs_sc_info (log writer structure)

The reason why we didn't design so from the beginning is because the
initial shape also differed from the above.  The early hierachy was
composed of "per-mount-point" super_block -> nilfs_sb_info pairs and a
shared nilfs object.  On the kernel 2.6.37, it was changed to the
current shape in order to unify super block instances into one per
device, and this cleanup became applicable as the result.

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

fs/nilfs2/bmap.c

+0 −1
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"

fs/nilfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	struct nilfs_transaction_info ti;

	int ret;



	if (unlikely(nilfs_near_disk_full(NILFS_SB(inode->i_sb)->s_nilfs)))

	if (unlikely(nilfs_near_disk_full(inode->i_sb->s_fs_info)))

		return VM_FAULT_SIGBUS; /* -ENOSPC */



	lock_page(page);

fs/nilfs2/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ const struct address_space_operations nilfs_aops = { 
struct inode *nilfs_new_inode(struct inode *dir, int mode)

{

	struct super_block *sb = dir->i_sb;

	struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs;

	struct the_nilfs *nilfs = sb->s_fs_info;

	struct inode *inode;

	struct nilfs_inode_info *ii;

	struct nilfs_root *root;
@@ -433,7 +433,7 @@ static int __nilfs_read_inode(struct super_block *sb, 
			      struct nilfs_root *root, unsigned long ino,

			      struct inode *inode)

{

	struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs;

	struct the_nilfs *nilfs = sb->s_fs_info;

	struct buffer_head *bh;

	struct nilfs_inode *raw_inode;

	int err;
@@ -807,7 +807,7 @@ int nilfs_permission(struct inode *inode, int mask, unsigned int flags) 


int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)

{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	struct nilfs_inode_info *ii = NILFS_I(inode);

	int err;
@@ -836,7 +836,7 @@ int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh) 
int nilfs_inode_dirty(struct inode *inode)

{

	struct nilfs_inode_info *ii = NILFS_I(inode);

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	int ret = 0;



	if (!list_empty(&ii->i_dirty)) {
@@ -851,7 +851,7 @@ int nilfs_inode_dirty(struct inode *inode) 
int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty)

{

	struct nilfs_inode_info *ii = NILFS_I(inode);

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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



	atomic_add(nr_dirty, &nilfs->ns_ndirtyblks);

fs/nilfs2/ioctl.c

+11 −12
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static int nilfs_ioctl_getversion(struct inode *inode, void __user *argp) 
static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp,

				     unsigned int cmd, void __user *argp)

{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

	struct inode *cpfile = nilfs->ns_cpfile;

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

	struct nilfs_transaction_info ti;

	struct nilfs_cpmode cpmode;

	int ret;
@@ -187,7 +186,7 @@ static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp, 


	nilfs_transaction_begin(inode->i_sb, &ti, 0);

	ret = nilfs_cpfile_change_cpmode(

		cpfile, cpmode.cm_cno, cpmode.cm_mode);

		nilfs->ns_cpfile, cpmode.cm_cno, cpmode.cm_mode);

	if (unlikely(ret < 0))

		nilfs_transaction_abort(inode->i_sb);

	else
@@ -203,7 +202,7 @@ static int 
nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp,

			      unsigned int cmd, void __user *argp)

{

	struct inode *cpfile = NILFS_SB(inode->i_sb)->s_nilfs->ns_cpfile;

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

	struct nilfs_transaction_info ti;

	__u64 cno;

	int ret;
@@ -220,7 +219,7 @@ nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp, 
		goto out;



	nilfs_transaction_begin(inode->i_sb, &ti, 0);

	ret = nilfs_cpfile_delete_checkpoint(cpfile, cno);

	ret = nilfs_cpfile_delete_checkpoint(nilfs->ns_cpfile, cno);

	if (unlikely(ret < 0))

		nilfs_transaction_abort(inode->i_sb);

	else
@@ -246,7 +245,7 @@ nilfs_ioctl_do_get_cpinfo(struct the_nilfs *nilfs, __u64 *posp, int flags, 
static int nilfs_ioctl_get_cpstat(struct inode *inode, struct file *filp,

				  unsigned int cmd, void __user *argp)

{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	struct nilfs_cpstat cpstat;

	int ret;
@@ -277,7 +276,7 @@ nilfs_ioctl_do_get_suinfo(struct the_nilfs *nilfs, __u64 *posp, int flags, 
static int nilfs_ioctl_get_sustat(struct inode *inode, struct file *filp,

				  unsigned int cmd, void __user *argp)

{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	struct nilfs_sustat sustat;

	int ret;
@@ -333,7 +332,7 @@ nilfs_ioctl_do_get_bdescs(struct the_nilfs *nilfs, __u64 *posp, int flags, 
static int nilfs_ioctl_get_bdescs(struct inode *inode, struct file *filp,

				  unsigned int cmd, void __user *argp)

{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	struct nilfs_argv argv;

	int ret;
@@ -402,7 +401,7 @@ static int nilfs_ioctl_move_blocks(struct super_block *sb, 
				   struct nilfs_argv *argv, void *buf)

{

	size_t nmembs = argv->v_nmembs;

	struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs;

	struct the_nilfs *nilfs = sb->s_fs_info;

	struct inode *inode;

	struct nilfs_vdesc *vdesc;

	struct buffer_head *bh, *n;
@@ -616,7 +615,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, 
		ret = PTR_ERR(kbufs[4]);

		goto out;

	}

	nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

	nilfs = inode->i_sb->s_fs_info;



	for (n = 0; n < 4; n++) {

		ret = -EINVAL;
@@ -689,7 +688,7 @@ static int nilfs_ioctl_sync(struct inode *inode, struct file *filp, 
		return ret;



	if (argp != NULL) {

		nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

		nilfs = inode->i_sb->s_fs_info;

		down_read(&nilfs->ns_segctor_sem);

		cno = nilfs->ns_cno - 1;

		up_read(&nilfs->ns_segctor_sem);
@@ -707,7 +706,7 @@ static int nilfs_ioctl_get_info(struct inode *inode, struct file *filp, 
						  void *, size_t, size_t))



{

	struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

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

	struct nilfs_argv argv;

	int ret;

fs/nilfs2/mdt.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline struct nilfs_mdt_info *NILFS_MDT(const struct inode *inode) 


static inline struct the_nilfs *NILFS_I_NILFS(struct inode *inode)

{

	return NILFS_SB(inode->i_sb)->s_nilfs;

	return inode->i_sb->s_fs_info;

}



/* Default GFP flags using highmem */