summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/ifile.c
diff options
context:
space:
mode:
authorVyacheslav Dubeyko <slava@dubeyko.com>2013-07-03 18:08:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:08:01 -0400
commite5f7f84843154db8b6ef5b2ac5e286f72212f54e (patch)
treee3d11da3a3b6bb3777998b9bc2919e48d47cddf6 /fs/nilfs2/ifile.c
parentc7ef972c440fc9f1eda28b450cd30ad15c4d60cf (diff)
] 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. Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com> Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Acked-by: Joern Engel <joern@logfs.org> Cc: Clemens Eisserer <linuxhippy@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/ifile.c')
-rw-r--r--fs/nilfs2/ifile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/ifile.c b/fs/nilfs2/ifile.c
index d788a5928351..6548c7851b48 100644
--- a/fs/nilfs2/ifile.c
+++ b/fs/nilfs2/ifile.c
@@ -174,7 +174,7 @@ int nilfs_ifile_count_free_inodes(struct inode *ifile,
174 *nmaxinodes = 0; 174 *nmaxinodes = 0;
175 *nfreeinodes = 0; 175 *nfreeinodes = 0;
176 176
177 nused = atomic_read(&NILFS_I(ifile)->i_root->inodes_count); 177 nused = atomic64_read(&NILFS_I(ifile)->i_root->inodes_count);
178 err = nilfs_palloc_count_max_entries(ifile, nused, nmaxinodes); 178 err = nilfs_palloc_count_max_entries(ifile, nused, nmaxinodes);
179 if (likely(!err)) 179 if (likely(!err))
180 *nfreeinodes = *nmaxinodes - nused; 180 *nfreeinodes = *nmaxinodes - nused;