diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-08-15 00:47:09 -0400 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-09-14 05:27:15 -0400 |
commit | 7a102b09232be1ad7c180dfd1f46c7aa95dff1e0 (patch) | |
tree | 81691c3a48e3108db1a5341c8dcf4531ac404cac /fs/nilfs2/the_nilfs.c | |
parent | 3218929dbd25245e0f601df1e359a3ed3f7fb03b (diff) |
nilfs2: remove individual gfp constants for each metadata file
This gets rid of NILFS_CPFILE_GFP, NILFS_SUFILE_GFP, NILFS_DAT_GFP,
and NILFS_IFILE_GFP. All of these constants refer to NILFS_MDT_GFP,
and can be removed.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/the_nilfs.c')
-rw-r--r-- | fs/nilfs2/the_nilfs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 0c4573653b87..d4168e269c5d 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -187,23 +187,19 @@ static int nilfs_load_super_root(struct the_nilfs *nilfs, | |||
187 | inode_size = nilfs->ns_inode_size; | 187 | inode_size = nilfs->ns_inode_size; |
188 | 188 | ||
189 | err = -ENOMEM; | 189 | err = -ENOMEM; |
190 | nilfs->ns_dat = nilfs_mdt_new( | 190 | nilfs->ns_dat = nilfs_mdt_new(nilfs, NULL, NILFS_DAT_INO); |
191 | nilfs, NULL, NILFS_DAT_INO, NILFS_DAT_GFP); | ||
192 | if (unlikely(!nilfs->ns_dat)) | 191 | if (unlikely(!nilfs->ns_dat)) |
193 | goto failed; | 192 | goto failed; |
194 | 193 | ||
195 | nilfs->ns_gc_dat = nilfs_mdt_new( | 194 | nilfs->ns_gc_dat = nilfs_mdt_new(nilfs, NULL, NILFS_DAT_INO); |
196 | nilfs, NULL, NILFS_DAT_INO, NILFS_DAT_GFP); | ||
197 | if (unlikely(!nilfs->ns_gc_dat)) | 195 | if (unlikely(!nilfs->ns_gc_dat)) |
198 | goto failed_dat; | 196 | goto failed_dat; |
199 | 197 | ||
200 | nilfs->ns_cpfile = nilfs_mdt_new( | 198 | nilfs->ns_cpfile = nilfs_mdt_new(nilfs, NULL, NILFS_CPFILE_INO); |
201 | nilfs, NULL, NILFS_CPFILE_INO, NILFS_CPFILE_GFP); | ||
202 | if (unlikely(!nilfs->ns_cpfile)) | 199 | if (unlikely(!nilfs->ns_cpfile)) |
203 | goto failed_gc_dat; | 200 | goto failed_gc_dat; |
204 | 201 | ||
205 | nilfs->ns_sufile = nilfs_mdt_new( | 202 | nilfs->ns_sufile = nilfs_mdt_new(nilfs, NULL, NILFS_SUFILE_INO); |
206 | nilfs, NULL, NILFS_SUFILE_INO, NILFS_SUFILE_GFP); | ||
207 | if (unlikely(!nilfs->ns_sufile)) | 203 | if (unlikely(!nilfs->ns_sufile)) |
208 | goto failed_cpfile; | 204 | goto failed_cpfile; |
209 | 205 | ||