nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct
Subsystems (2)
PATCH v6 2/2 nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct
From: Vyacheslav Dubeyko <[email protected]>
Subject: [PATCH v6 2/2] nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct
The cp_inodes_count and cp_blocks_count are represented as __le64 type in on-disk structure (struct nilfs_checkpoint). But analogous fields in in-core structure (struct nilfs_root) are represented by atomic_t type.
This patch replaces atomic_t on atomic64_t type in representation of inodes_count and blocks_count fields in struct nilfs_root.
--- fs/nilfs2/ifile.c | 2 +- fs/nilfs2/inode.c | 8 ++++---- fs/nilfs2/segment.c | 4 ++-- fs/nilfs2/super.c | 8 +++++--- fs/nilfs2/the_nilfs.c | 4 ++-- fs/nilfs2/the_nilfs.h | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-)
fs/nilfs2/ifile.c +1 -1
@@ -174,7 +174,7 @@ int nilfs_ifile_count_free_inodes(struct inode *ifile, *nmaxinodes =0 ; *nfreeinodes =0 ; - nused =atomic_read (&NILFS_I (ifile)->i_root->inodes_count); + nused =atomic64_read (&NILFS_I (ifile)->i_root->inodes_count); err =nilfs_palloc_count_max_entries (ifile, nused, nmaxinodes);if (likely (!err)) *nfreeinodes = *nmaxinodes - nused;
fs/nilfs2/inode.c +4 -4
@@ -54,7 +54,7 @@ void nilfs_inode_add_blocks(struct inode *inode, int n)inode_add_bytes (inode, (1 << inode->i_blkbits) * n);if (root) -atomic_add (n, &root->blocks_count); +atomic64_add (n, &root->blocks_count); }void nilfs_inode_sub_blocks (struct inode *inode,int n)
@@ -63,7 +63,7 @@ void nilfs_inode_sub_blocks(struct inode *inode, int n)inode_sub_bytes (inode, (1 << inode->i_blkbits) * n);if (root) -atomic_sub (n, &root->blocks_count); +atomic64_sub (n, &root->blocks_count); }/**
@@ -350,7 +350,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) goto failed_ifile_create_inode;/* reference count of i_bh inherits from nilfs_mdt_read_block() */ -atomic_inc (&root->inodes_count); +atomic64_inc (&root->inodes_count);inode_init_owner (inode, dir, mode); inode->i_ino = ino; inode->i_mtime = inode->i_atime = inode->i_ctime =CURRENT_TIME ;
@@ -782,7 +782,7 @@ void nilfs_evict_inode(struct inode *inode) ret =nilfs_ifile_delete_inode (ii->i_root->ifile, inode->i_ino);if (!ret) -atomic_dec (&ii->i_root->inodes_count); +atomic64_dec (&ii->i_root->inodes_count);nilfs_clear_inode (inode);
fs/nilfs2/segment.c +2 -2
@@ -835,9 +835,9 @@ static int nilfs_segctor_fill_in_checkpoint(struct nilfs_sc_info *sci) raw_cp->cp_snapshot_list.ssl_next =0 ; raw_cp->cp_snapshot_list.ssl_prev =0 ; raw_cp->cp_inodes_count = -cpu_to_le64 (atomic_read (&sci->sc_root->inodes_count)); +cpu_to_le64 (atomic64_read (&sci->sc_root->inodes_count)); raw_cp->cp_blocks_count = -cpu_to_le64 (atomic_read (&sci->sc_root->blocks_count)); +cpu_to_le64 (atomic64_read (&sci->sc_root->blocks_count)); raw_cp->cp_nblk_inc =cpu_to_le64 (sci->sc_nblk_inc + sci->sc_nblk_this_inc); raw_cp->cp_create =cpu_to_le64 (sci->sc_seg_ctime);
fs/nilfs2/super.c +5 -3
@@ -554,8 +554,10 @@ int nilfs_attach_checkpoint(struct super_block *sb, __u64 cno, int curr_mnt,if (err) goto failed_bh; -atomic_set (&root->inodes_count,le64_to_cpu (raw_cp->cp_inodes_count)); -atomic_set (&root->blocks_count,le64_to_cpu (raw_cp->cp_blocks_count)); +atomic64_set (&root->inodes_count, +le64_to_cpu (raw_cp->cp_inodes_count)); +atomic64_set (&root->blocks_count, +le64_to_cpu (raw_cp->cp_blocks_count));nilfs_cpfile_put_checkpoint (nilfs->ns_cpfile, cno, bh_cp);
@@ -647,7 +649,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)* curent inodes count as maximum possible and * zero as free inodes value. */ - nmaxinodes =atomic_read (&root->inodes_count); + nmaxinodes =atomic64_read (&root->inodes_count); nfreeinodes =0 ; err =0 ; }else
fs/nilfs2/the_nilfs.c +2 -2
@@ -764,8 +764,8 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno) new->ifile =NULL ; new->nilfs = nilfs;atomic_set (&new->count,1 ); -atomic_set (&new->inodes_count,0 ); -atomic_set (&new->blocks_count,0 ); +atomic64_set (&new->inodes_count,0 ); +atomic64_set (&new->blocks_count,0 );rb_link_node (&new->rb_node, parent, p);rb_insert_color (&new->rb_node, &nilfs->ns_cptree);
fs/nilfs2/the_nilfs.h +2 -2
@@ -241,8 +241,8 @@ struct nilfs_root {struct the_nilfs *nilfs;struct inode *ifile; -atomic_t inodes_count; -atomic_t blocks_count; +atomic64_t inodes_count; +atomic64_t blocks_count; };/* Special checkpoint number */
Signature · 8 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Vyacheslav Dubeyko
From: Vyacheslav Dubeyko <[email protected]>
Subject: [PATCH v6 2/2] nilfs2: useatomic64_ttype forinodes_countandblocks_countfields innilfs_rootstructThe
cp_inodes_countandcp_blocks_countare represented as__le64type in on-disk structure (structnilfs_checkpoint). But analogous fields in in-core structure (structnilfs_root) are represented byatomic_ttype.
Quoted 6 lines
This patch replaces
atomic_tonatomic64_ttype in representation ofinodes_countandblocks_countfields in structnilfs_root.Signed-off-by Vyacheslav Dubeyko <[email protected]>CC Ryusuke Konishi <[email protected]>CC Joern Engel <[email protected]>
Thanks,
Ryusuke Konishi
Quoted 143 lines
--- fs/nilfs2/ifile.c | 2 +- fs/nilfs2/inode.c | 8 ++++---- fs/nilfs2/segment.c | 4 ++-- fs/nilfs2/super.c | 8 +++++--- fs/nilfs2/the_nilfs.c | 4 ++-- fs/nilfs2/the_nilfs.h | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-)fs/nilfs2/ifile.c +1
-1@@ -174,7 +174,7 @@ int nilfs_ifile_count_free_inodes(struct inode *ifile, *nmaxinodes =0 ; *nfreeinodes =0 ; - nused =atomic_read (&NILFS_I (ifile)->i_root->inodes_count); + nused =atomic64_read (&NILFS_I (ifile)->i_root->inodes_count); err =nilfs_palloc_count_max_entries (ifile, nused, nmaxinodes);if (likely (!err)) *nfreeinodes = *nmaxinodes - nused;fs/nilfs2/inode.c +4
-4@@ -54,7 +54,7 @@ void nilfs_inode_add_blocks(struct inode *inode, int n)inode_add_bytes (inode, (1 << inode->i_blkbits) * n);if (root) -atomic_add (n, &root->blocks_count); +atomic64_add (n, &root->blocks_count); }void nilfs_inode_sub_blocks (struct inode *inode,int n)@@ -63,7 +63,7 @@ void nilfs_inode_sub_blocks(struct inode *inode, int n)inode_sub_bytes (inode, (1 << inode->i_blkbits) * n);if (root) -atomic_sub (n, &root->blocks_count); +atomic64_sub (n, &root->blocks_count); }/** @@ -350,7 +350,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) goto failed_ifile_create_inode;/* reference count of i_bh inherits from nilfs_mdt_read_block() */ -atomic_inc (&root->inodes_count); +atomic64_inc (&root->inodes_count);inode_init_owner (inode, dir, mode); inode->i_ino = ino; inode->i_mtime = inode->i_atime = inode->i_ctime =CURRENT_TIME ;@@ -782,7 +782,7 @@ void nilfs_evict_inode(struct inode *inode) ret =nilfs_ifile_delete_inode (ii->i_root->ifile, inode->i_ino);if (!ret) -atomic_dec (&ii->i_root->inodes_count); +atomic64_dec (&ii->i_root->inodes_count);nilfs_clear_inode (inode);fs/nilfs2/segment.c +2
-2@@ -835,9 +835,9 @@ static int nilfs_segctor_fill_in_checkpoint(struct nilfs_sc_info *sci) raw_cp->cp_snapshot_list.ssl_next =0 ; raw_cp->cp_snapshot_list.ssl_prev =0 ; raw_cp->cp_inodes_count = -cpu_to_le64 (atomic_read (&sci->sc_root->inodes_count)); +cpu_to_le64 (atomic64_read (&sci->sc_root->inodes_count)); raw_cp->cp_blocks_count = -cpu_to_le64 (atomic_read (&sci->sc_root->blocks_count)); +cpu_to_le64 (atomic64_read (&sci->sc_root->blocks_count)); raw_cp->cp_nblk_inc =cpu_to_le64 (sci->sc_nblk_inc + sci->sc_nblk_this_inc); raw_cp->cp_create =cpu_to_le64 (sci->sc_seg_ctime);fs/nilfs2/super.c +5
-3@@ -554,8 +554,10 @@ int nilfs_attach_checkpoint(struct super_block *sb, __u64 cno, int curr_mnt,if (err) goto failed_bh; -atomic_set (&root->inodes_count,le64_to_cpu (raw_cp->cp_inodes_count)); -atomic_set (&root->blocks_count,le64_to_cpu (raw_cp->cp_blocks_count)); +atomic64_set (&root->inodes_count, +le64_to_cpu (raw_cp->cp_inodes_count)); +atomic64_set (&root->blocks_count, +le64_to_cpu (raw_cp->cp_blocks_count));nilfs_cpfile_put_checkpoint (nilfs->ns_cpfile, cno, bh_cp);@@ -647,7 +649,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)* curent inodes count as maximum possible and * zero as free inodes value. */ - nmaxinodes =atomic_read (&root->inodes_count); + nmaxinodes =atomic64_read (&root->inodes_count); nfreeinodes =0 ; err =0 ; }else fs/nilfs2/the_nilfs.c +2
-2@@ -764,8 +764,8 @@ nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno) new->ifile =NULL ; new->nilfs = nilfs;atomic_set (&new->count,1 ); -atomic_set (&new->inodes_count,0 ); -atomic_set (&new->blocks_count,0 ); +atomic64_set (&new->inodes_count,0 ); +atomic64_set (&new->blocks_count,0 );rb_link_node (&new->rb_node, parent, p);rb_insert_color (&new->rb_node, &nilfs->ns_cptree);fs/nilfs2/the_nilfs.h +2
-2@@ -241,8 +241,8 @@ struct nilfs_root {struct the_nilfs *nilfs;struct inode *ifile; -atomic_t inodes_count; -atomic_t blocks_count; +atomic64_t inodes_count; +atomic64_t blocks_count; };/* Special checkpoint number */ Signature · 8 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20130530.003256.27786650.konishi.ryusuke-Zyj7fXuS5i5L9jVzuh4AOg@public.gmane.org
Jörn Engel
Acked-byQuoted 9 lines · Ryusuke Konishi
Quoted 8 lines · Vyacheslav Dubeyko
From: Vyacheslav Dubeyko <[email protected]>
Subject: [PATCH v6 2/2] nilfs2: useatomic64_ttype forinodes_countandblocks_countfields innilfs_rootstructThe
cp_inodes_countandcp_blocks_countare represented as__le64type in on-disk structure (structnilfs_checkpoint). But analogous fields in in-core structure (structnilfs_root) are represented byatomic_ttype.
Quoted 8 lines
Quoted 6 lines
This patch replaces
atomic_tonatomic64_ttype in representation ofinodes_countandblocks_countfields in structnilfs_root.Signed-off-by Vyacheslav Dubeyko <[email protected]>CC Ryusuke Konishi <[email protected]>CC Joern Engel <joern-PCqxUs/[email protected]>Acked-by Ryusuke Konishi <[email protected]>
Not sure how much this is actually worth, but
Jörn
--
Linux is more the core point of a concept that surrounds "open source" which, in turn, is based on a false concept. This concept is that people actually want to look at source code.
-- Rob Enderle
--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html