1 // SPDX-License-Identifier: GPL-2.0+ 1 // SPDX-License-Identifier: GPL-2.0+
2 /* 2 /*
3 * the_nilfs shared structure. 3 * the_nilfs shared structure.
4 * 4 *
5 * Copyright (C) 2005-2008 Nippon Telegraph an 5 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
6 * 6 *
7 * Written by Ryusuke Konishi. 7 * Written by Ryusuke Konishi.
8 * 8 *
9 */ 9 */
10 10
11 #include <linux/buffer_head.h> 11 #include <linux/buffer_head.h>
12 #include <linux/slab.h> 12 #include <linux/slab.h>
13 #include <linux/blkdev.h> 13 #include <linux/blkdev.h>
14 #include <linux/backing-dev.h> 14 #include <linux/backing-dev.h>
15 #include <linux/log2.h> !! 15 #include <linux/random.h>
16 #include <linux/crc32.h> 16 #include <linux/crc32.h>
17 #include "nilfs.h" 17 #include "nilfs.h"
18 #include "segment.h" 18 #include "segment.h"
19 #include "alloc.h" 19 #include "alloc.h"
20 #include "cpfile.h" 20 #include "cpfile.h"
21 #include "sufile.h" 21 #include "sufile.h"
22 #include "dat.h" 22 #include "dat.h"
23 #include "segbuf.h" 23 #include "segbuf.h"
24 24
25 25
26 static int nilfs_valid_sb(struct nilfs_super_b 26 static int nilfs_valid_sb(struct nilfs_super_block *sbp);
27 27
28 void nilfs_set_last_segment(struct the_nilfs * 28 void nilfs_set_last_segment(struct the_nilfs *nilfs,
29 sector_t start_blo 29 sector_t start_blocknr, u64 seq, __u64 cno)
30 { 30 {
31 spin_lock(&nilfs->ns_last_segment_lock 31 spin_lock(&nilfs->ns_last_segment_lock);
32 nilfs->ns_last_pseg = start_blocknr; 32 nilfs->ns_last_pseg = start_blocknr;
33 nilfs->ns_last_seq = seq; 33 nilfs->ns_last_seq = seq;
34 nilfs->ns_last_cno = cno; 34 nilfs->ns_last_cno = cno;
35 35
36 if (!nilfs_sb_dirty(nilfs)) { 36 if (!nilfs_sb_dirty(nilfs)) {
37 if (nilfs->ns_prev_seq == nilf 37 if (nilfs->ns_prev_seq == nilfs->ns_last_seq)
38 goto stay_cursor; 38 goto stay_cursor;
39 39
40 set_nilfs_sb_dirty(nilfs); 40 set_nilfs_sb_dirty(nilfs);
41 } 41 }
42 nilfs->ns_prev_seq = nilfs->ns_last_se 42 nilfs->ns_prev_seq = nilfs->ns_last_seq;
43 43
44 stay_cursor: 44 stay_cursor:
45 spin_unlock(&nilfs->ns_last_segment_lo 45 spin_unlock(&nilfs->ns_last_segment_lock);
46 } 46 }
47 47
48 /** 48 /**
49 * alloc_nilfs - allocate a nilfs object 49 * alloc_nilfs - allocate a nilfs object
50 * @sb: super block instance 50 * @sb: super block instance
51 * 51 *
52 * Return Value: On success, pointer to the_ni 52 * Return Value: On success, pointer to the_nilfs is returned.
53 * On error, NULL is returned. 53 * On error, NULL is returned.
54 */ 54 */
55 struct the_nilfs *alloc_nilfs(struct super_blo 55 struct the_nilfs *alloc_nilfs(struct super_block *sb)
56 { 56 {
57 struct the_nilfs *nilfs; 57 struct the_nilfs *nilfs;
58 58
59 nilfs = kzalloc(sizeof(*nilfs), GFP_KE 59 nilfs = kzalloc(sizeof(*nilfs), GFP_KERNEL);
60 if (!nilfs) 60 if (!nilfs)
61 return NULL; 61 return NULL;
62 62
63 nilfs->ns_sb = sb; 63 nilfs->ns_sb = sb;
64 nilfs->ns_bdev = sb->s_bdev; 64 nilfs->ns_bdev = sb->s_bdev;
65 atomic_set(&nilfs->ns_ndirtyblks, 0); 65 atomic_set(&nilfs->ns_ndirtyblks, 0);
66 init_rwsem(&nilfs->ns_sem); 66 init_rwsem(&nilfs->ns_sem);
67 mutex_init(&nilfs->ns_snapshot_mount_m 67 mutex_init(&nilfs->ns_snapshot_mount_mutex);
68 INIT_LIST_HEAD(&nilfs->ns_dirty_files) 68 INIT_LIST_HEAD(&nilfs->ns_dirty_files);
69 INIT_LIST_HEAD(&nilfs->ns_gc_inodes); 69 INIT_LIST_HEAD(&nilfs->ns_gc_inodes);
70 spin_lock_init(&nilfs->ns_inode_lock); 70 spin_lock_init(&nilfs->ns_inode_lock);
>> 71 spin_lock_init(&nilfs->ns_next_gen_lock);
71 spin_lock_init(&nilfs->ns_last_segment 72 spin_lock_init(&nilfs->ns_last_segment_lock);
72 nilfs->ns_cptree = RB_ROOT; 73 nilfs->ns_cptree = RB_ROOT;
73 spin_lock_init(&nilfs->ns_cptree_lock) 74 spin_lock_init(&nilfs->ns_cptree_lock);
74 init_rwsem(&nilfs->ns_segctor_sem); 75 init_rwsem(&nilfs->ns_segctor_sem);
75 nilfs->ns_sb_update_freq = NILFS_SB_FR 76 nilfs->ns_sb_update_freq = NILFS_SB_FREQ;
76 77
77 return nilfs; 78 return nilfs;
78 } 79 }
79 80
80 /** 81 /**
81 * destroy_nilfs - destroy nilfs object 82 * destroy_nilfs - destroy nilfs object
82 * @nilfs: nilfs object to be released 83 * @nilfs: nilfs object to be released
83 */ 84 */
84 void destroy_nilfs(struct the_nilfs *nilfs) 85 void destroy_nilfs(struct the_nilfs *nilfs)
85 { 86 {
86 might_sleep(); 87 might_sleep();
87 if (nilfs_init(nilfs)) { 88 if (nilfs_init(nilfs)) {
>> 89 nilfs_sysfs_delete_device_group(nilfs);
88 brelse(nilfs->ns_sbh[0]); 90 brelse(nilfs->ns_sbh[0]);
89 brelse(nilfs->ns_sbh[1]); 91 brelse(nilfs->ns_sbh[1]);
90 } 92 }
91 kfree(nilfs); 93 kfree(nilfs);
92 } 94 }
93 95
94 static int nilfs_load_super_root(struct the_ni 96 static int nilfs_load_super_root(struct the_nilfs *nilfs,
95 struct super_ 97 struct super_block *sb, sector_t sr_block)
96 { 98 {
97 struct buffer_head *bh_sr; 99 struct buffer_head *bh_sr;
98 struct nilfs_super_root *raw_sr; 100 struct nilfs_super_root *raw_sr;
99 struct nilfs_super_block **sbp = nilfs 101 struct nilfs_super_block **sbp = nilfs->ns_sbp;
100 struct nilfs_inode *rawi; 102 struct nilfs_inode *rawi;
101 unsigned int dat_entry_size, segment_u 103 unsigned int dat_entry_size, segment_usage_size, checkpoint_size;
102 unsigned int inode_size; 104 unsigned int inode_size;
103 int err; 105 int err;
104 106
105 err = nilfs_read_super_root_block(nilf 107 err = nilfs_read_super_root_block(nilfs, sr_block, &bh_sr, 1);
106 if (unlikely(err)) 108 if (unlikely(err))
107 return err; 109 return err;
108 110
109 down_read(&nilfs->ns_sem); 111 down_read(&nilfs->ns_sem);
110 dat_entry_size = le16_to_cpu(sbp[0]->s 112 dat_entry_size = le16_to_cpu(sbp[0]->s_dat_entry_size);
111 checkpoint_size = le16_to_cpu(sbp[0]-> 113 checkpoint_size = le16_to_cpu(sbp[0]->s_checkpoint_size);
112 segment_usage_size = le16_to_cpu(sbp[0 114 segment_usage_size = le16_to_cpu(sbp[0]->s_segment_usage_size);
113 up_read(&nilfs->ns_sem); 115 up_read(&nilfs->ns_sem);
114 116
115 inode_size = nilfs->ns_inode_size; 117 inode_size = nilfs->ns_inode_size;
116 118
117 rawi = (void *)bh_sr->b_data + NILFS_S 119 rawi = (void *)bh_sr->b_data + NILFS_SR_DAT_OFFSET(inode_size);
118 err = nilfs_dat_read(sb, dat_entry_siz 120 err = nilfs_dat_read(sb, dat_entry_size, rawi, &nilfs->ns_dat);
119 if (err) 121 if (err)
120 goto failed; 122 goto failed;
121 123
122 rawi = (void *)bh_sr->b_data + NILFS_S 124 rawi = (void *)bh_sr->b_data + NILFS_SR_CPFILE_OFFSET(inode_size);
123 err = nilfs_cpfile_read(sb, checkpoint 125 err = nilfs_cpfile_read(sb, checkpoint_size, rawi, &nilfs->ns_cpfile);
124 if (err) 126 if (err)
125 goto failed_dat; 127 goto failed_dat;
126 128
127 rawi = (void *)bh_sr->b_data + NILFS_S 129 rawi = (void *)bh_sr->b_data + NILFS_SR_SUFILE_OFFSET(inode_size);
128 err = nilfs_sufile_read(sb, segment_us 130 err = nilfs_sufile_read(sb, segment_usage_size, rawi,
129 &nilfs->ns_suf 131 &nilfs->ns_sufile);
130 if (err) 132 if (err)
131 goto failed_cpfile; 133 goto failed_cpfile;
132 134
133 raw_sr = (struct nilfs_super_root *)bh 135 raw_sr = (struct nilfs_super_root *)bh_sr->b_data;
134 nilfs->ns_nongc_ctime = le64_to_cpu(ra 136 nilfs->ns_nongc_ctime = le64_to_cpu(raw_sr->sr_nongc_ctime);
135 137
136 failed: 138 failed:
137 brelse(bh_sr); 139 brelse(bh_sr);
138 return err; 140 return err;
139 141
140 failed_cpfile: 142 failed_cpfile:
141 iput(nilfs->ns_cpfile); 143 iput(nilfs->ns_cpfile);
142 144
143 failed_dat: 145 failed_dat:
144 iput(nilfs->ns_dat); 146 iput(nilfs->ns_dat);
145 goto failed; 147 goto failed;
146 } 148 }
147 149
148 static void nilfs_init_recovery_info(struct ni 150 static void nilfs_init_recovery_info(struct nilfs_recovery_info *ri)
149 { 151 {
150 memset(ri, 0, sizeof(*ri)); 152 memset(ri, 0, sizeof(*ri));
151 INIT_LIST_HEAD(&ri->ri_used_segments); 153 INIT_LIST_HEAD(&ri->ri_used_segments);
152 } 154 }
153 155
154 static void nilfs_clear_recovery_info(struct n 156 static void nilfs_clear_recovery_info(struct nilfs_recovery_info *ri)
155 { 157 {
156 nilfs_dispose_segment_list(&ri->ri_use 158 nilfs_dispose_segment_list(&ri->ri_used_segments);
157 } 159 }
158 160
159 /** 161 /**
160 * nilfs_store_log_cursor - load log cursor fr 162 * nilfs_store_log_cursor - load log cursor from a super block
161 * @nilfs: nilfs object 163 * @nilfs: nilfs object
162 * @sbp: buffer storing super block to be read 164 * @sbp: buffer storing super block to be read
163 * 165 *
164 * nilfs_store_log_cursor() reads the last pos 166 * nilfs_store_log_cursor() reads the last position of the log
165 * containing a super root from a given super 167 * containing a super root from a given super block, and initializes
166 * relevant information on the nilfs object pr 168 * relevant information on the nilfs object preparatory for log
167 * scanning and recovery. 169 * scanning and recovery.
168 */ 170 */
169 static int nilfs_store_log_cursor(struct the_n 171 static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
170 struct nilfs 172 struct nilfs_super_block *sbp)
171 { 173 {
172 int ret = 0; 174 int ret = 0;
173 175
174 nilfs->ns_last_pseg = le64_to_cpu(sbp- 176 nilfs->ns_last_pseg = le64_to_cpu(sbp->s_last_pseg);
175 nilfs->ns_last_cno = le64_to_cpu(sbp-> 177 nilfs->ns_last_cno = le64_to_cpu(sbp->s_last_cno);
176 nilfs->ns_last_seq = le64_to_cpu(sbp-> 178 nilfs->ns_last_seq = le64_to_cpu(sbp->s_last_seq);
177 179
178 nilfs->ns_prev_seq = nilfs->ns_last_se 180 nilfs->ns_prev_seq = nilfs->ns_last_seq;
179 nilfs->ns_seg_seq = nilfs->ns_last_seq 181 nilfs->ns_seg_seq = nilfs->ns_last_seq;
180 nilfs->ns_segnum = 182 nilfs->ns_segnum =
181 nilfs_get_segnum_of_block(nilf 183 nilfs_get_segnum_of_block(nilfs, nilfs->ns_last_pseg);
182 nilfs->ns_cno = nilfs->ns_last_cno + 1 184 nilfs->ns_cno = nilfs->ns_last_cno + 1;
183 if (nilfs->ns_segnum >= nilfs->ns_nseg 185 if (nilfs->ns_segnum >= nilfs->ns_nsegments) {
184 nilfs_err(nilfs->ns_sb, 186 nilfs_err(nilfs->ns_sb,
185 "pointed segment num 187 "pointed segment number is out of range: segnum=%llu, nsegments=%lu",
186 (unsigned long long) 188 (unsigned long long)nilfs->ns_segnum,
187 nilfs->ns_nsegments) 189 nilfs->ns_nsegments);
188 ret = -EINVAL; 190 ret = -EINVAL;
189 } 191 }
190 return ret; 192 return ret;
191 } 193 }
192 194
193 /** 195 /**
194 * nilfs_get_blocksize - get block size from r <<
195 * @sb: super block instance <<
196 * @sbp: superblock raw data buffer <<
197 * @blocksize: place to store block size <<
198 * <<
199 * nilfs_get_blocksize() calculates the block <<
200 * exponent information written in @sbp and st <<
201 * or aborts with an error message if it's too <<
202 * <<
203 * Return Value: On success, 0 is returned. If <<
204 * large, -EINVAL is returned. <<
205 */ <<
206 static int nilfs_get_blocksize(struct super_bl <<
207 struct nilfs_su <<
208 { <<
209 unsigned int shift_bits = le32_to_cpu( <<
210 <<
211 if (unlikely(shift_bits > <<
212 ilog2(NILFS_MAX_BLOCK_SIZ <<
213 nilfs_err(sb, "too large files <<
214 shift_bits); <<
215 return -EINVAL; <<
216 } <<
217 *blocksize = BLOCK_SIZE << shift_bits; <<
218 return 0; <<
219 } <<
220 <<
221 /** <<
222 * load_nilfs - load and recover the nilfs 196 * load_nilfs - load and recover the nilfs
223 * @nilfs: the_nilfs structure to be released 197 * @nilfs: the_nilfs structure to be released
224 * @sb: super block instance used to recover p 198 * @sb: super block instance used to recover past segment
225 * 199 *
226 * load_nilfs() searches and load the latest s 200 * load_nilfs() searches and load the latest super root,
227 * attaches the last segment, and does recover 201 * attaches the last segment, and does recovery if needed.
228 * The caller must call this exclusively for s 202 * The caller must call this exclusively for simultaneous mounts.
229 */ 203 */
230 int load_nilfs(struct the_nilfs *nilfs, struct 204 int load_nilfs(struct the_nilfs *nilfs, struct super_block *sb)
231 { 205 {
232 struct nilfs_recovery_info ri; 206 struct nilfs_recovery_info ri;
233 unsigned int s_flags = sb->s_flags; 207 unsigned int s_flags = sb->s_flags;
234 int really_read_only = bdev_read_only( 208 int really_read_only = bdev_read_only(nilfs->ns_bdev);
235 int valid_fs = nilfs_valid_fs(nilfs); 209 int valid_fs = nilfs_valid_fs(nilfs);
236 int err; 210 int err;
237 211
238 if (!valid_fs) { 212 if (!valid_fs) {
239 nilfs_warn(sb, "mounting unche 213 nilfs_warn(sb, "mounting unchecked fs");
240 if (s_flags & SB_RDONLY) { 214 if (s_flags & SB_RDONLY) {
241 nilfs_info(sb, 215 nilfs_info(sb,
242 "recovery r 216 "recovery required for readonly filesystem");
243 nilfs_info(sb, 217 nilfs_info(sb,
244 "write acce 218 "write access will be enabled during recovery");
245 } 219 }
246 } 220 }
247 221
248 nilfs_init_recovery_info(&ri); 222 nilfs_init_recovery_info(&ri);
249 223
250 err = nilfs_search_super_root(nilfs, & 224 err = nilfs_search_super_root(nilfs, &ri);
251 if (unlikely(err)) { 225 if (unlikely(err)) {
252 struct nilfs_super_block **sbp 226 struct nilfs_super_block **sbp = nilfs->ns_sbp;
253 int blocksize; 227 int blocksize;
254 228
255 if (err != -EINVAL) 229 if (err != -EINVAL)
256 goto scan_error; 230 goto scan_error;
257 231
258 if (!nilfs_valid_sb(sbp[1])) { 232 if (!nilfs_valid_sb(sbp[1])) {
259 nilfs_warn(sb, 233 nilfs_warn(sb,
260 "unable to 234 "unable to fall back to spare super block");
261 goto scan_error; 235 goto scan_error;
262 } 236 }
263 nilfs_info(sb, "trying rollbac 237 nilfs_info(sb, "trying rollback from an earlier position");
264 238
265 /* 239 /*
266 * restore super block with it 240 * restore super block with its spare and reconfigure
267 * relevant states of the nilf 241 * relevant states of the nilfs object.
268 */ 242 */
269 memcpy(sbp[0], sbp[1], nilfs-> 243 memcpy(sbp[0], sbp[1], nilfs->ns_sbsize);
270 nilfs->ns_crc_seed = le32_to_c 244 nilfs->ns_crc_seed = le32_to_cpu(sbp[0]->s_crc_seed);
271 nilfs->ns_sbwtime = le64_to_cp 245 nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime);
272 246
273 /* verify consistency between 247 /* verify consistency between two super blocks */
274 err = nilfs_get_blocksize(sb, !! 248 blocksize = BLOCK_SIZE << le32_to_cpu(sbp[0]->s_log_block_size);
275 if (err) <<
276 goto scan_error; <<
277 <<
278 if (blocksize != nilfs->ns_blo 249 if (blocksize != nilfs->ns_blocksize) {
279 nilfs_warn(sb, 250 nilfs_warn(sb,
280 "blocksize 251 "blocksize differs between two super blocks (%d != %d)",
281 blocksize, 252 blocksize, nilfs->ns_blocksize);
282 err = -EINVAL; <<
283 goto scan_error; 253 goto scan_error;
284 } 254 }
285 255
286 err = nilfs_store_log_cursor(n 256 err = nilfs_store_log_cursor(nilfs, sbp[0]);
287 if (err) 257 if (err)
288 goto scan_error; 258 goto scan_error;
289 259
290 /* drop clean flag to allow ro 260 /* drop clean flag to allow roll-forward and recovery */
291 nilfs->ns_mount_state &= ~NILF 261 nilfs->ns_mount_state &= ~NILFS_VALID_FS;
292 valid_fs = 0; 262 valid_fs = 0;
293 263
294 err = nilfs_search_super_root( 264 err = nilfs_search_super_root(nilfs, &ri);
295 if (err) 265 if (err)
296 goto scan_error; 266 goto scan_error;
297 } 267 }
298 268
299 err = nilfs_load_super_root(nilfs, sb, 269 err = nilfs_load_super_root(nilfs, sb, ri.ri_super_root);
300 if (unlikely(err)) { 270 if (unlikely(err)) {
301 nilfs_err(sb, "error %d while 271 nilfs_err(sb, "error %d while loading super root", err);
302 goto failed; 272 goto failed;
303 } 273 }
304 274
305 err = nilfs_sysfs_create_device_group( <<
306 if (unlikely(err)) <<
307 goto sysfs_error; <<
308 <<
309 if (valid_fs) 275 if (valid_fs)
310 goto skip_recovery; 276 goto skip_recovery;
311 277
312 if (s_flags & SB_RDONLY) { 278 if (s_flags & SB_RDONLY) {
313 __u64 features; 279 __u64 features;
314 280
315 if (nilfs_test_opt(nilfs, NORE 281 if (nilfs_test_opt(nilfs, NORECOVERY)) {
316 nilfs_info(sb, 282 nilfs_info(sb,
317 "norecovery 283 "norecovery option specified, skipping roll-forward recovery");
318 goto skip_recovery; 284 goto skip_recovery;
319 } 285 }
320 features = le64_to_cpu(nilfs-> 286 features = le64_to_cpu(nilfs->ns_sbp[0]->s_feature_compat_ro) &
321 ~NILFS_FEATURE_COMPAT_ 287 ~NILFS_FEATURE_COMPAT_RO_SUPP;
322 if (features) { 288 if (features) {
323 nilfs_err(sb, 289 nilfs_err(sb,
324 "couldn't pr 290 "couldn't proceed with recovery because of unsupported optional features (%llx)",
325 (unsigned lo 291 (unsigned long long)features);
326 err = -EROFS; 292 err = -EROFS;
327 goto failed_unload; 293 goto failed_unload;
328 } 294 }
329 if (really_read_only) { 295 if (really_read_only) {
330 nilfs_err(sb, 296 nilfs_err(sb,
331 "write acces 297 "write access unavailable, cannot proceed");
332 err = -EROFS; 298 err = -EROFS;
333 goto failed_unload; 299 goto failed_unload;
334 } 300 }
335 sb->s_flags &= ~SB_RDONLY; 301 sb->s_flags &= ~SB_RDONLY;
336 } else if (nilfs_test_opt(nilfs, NOREC 302 } else if (nilfs_test_opt(nilfs, NORECOVERY)) {
337 nilfs_err(sb, 303 nilfs_err(sb,
338 "recovery cancelled 304 "recovery cancelled because norecovery option was specified for a read/write mount");
339 err = -EINVAL; 305 err = -EINVAL;
340 goto failed_unload; 306 goto failed_unload;
341 } 307 }
342 308
343 err = nilfs_salvage_orphan_logs(nilfs, 309 err = nilfs_salvage_orphan_logs(nilfs, sb, &ri);
344 if (err) 310 if (err)
345 goto failed_unload; 311 goto failed_unload;
346 312
347 down_write(&nilfs->ns_sem); 313 down_write(&nilfs->ns_sem);
348 nilfs->ns_mount_state |= NILFS_VALID_F 314 nilfs->ns_mount_state |= NILFS_VALID_FS; /* set "clean" flag */
349 err = nilfs_cleanup_super(sb); 315 err = nilfs_cleanup_super(sb);
350 up_write(&nilfs->ns_sem); 316 up_write(&nilfs->ns_sem);
351 317
352 if (err) { 318 if (err) {
353 nilfs_err(sb, 319 nilfs_err(sb,
354 "error %d updating s 320 "error %d updating super block. recovery unfinished.",
355 err); 321 err);
356 goto failed_unload; 322 goto failed_unload;
357 } 323 }
358 nilfs_info(sb, "recovery complete"); 324 nilfs_info(sb, "recovery complete");
359 325
360 skip_recovery: 326 skip_recovery:
361 nilfs_clear_recovery_info(&ri); 327 nilfs_clear_recovery_info(&ri);
362 sb->s_flags = s_flags; 328 sb->s_flags = s_flags;
363 return 0; 329 return 0;
364 330
365 scan_error: 331 scan_error:
366 nilfs_err(sb, "error %d while searchin 332 nilfs_err(sb, "error %d while searching super root", err);
367 goto failed; 333 goto failed;
368 334
369 failed_unload: 335 failed_unload:
370 nilfs_sysfs_delete_device_group(nilfs) <<
371 <<
372 sysfs_error: <<
373 iput(nilfs->ns_cpfile); 336 iput(nilfs->ns_cpfile);
374 iput(nilfs->ns_sufile); 337 iput(nilfs->ns_sufile);
375 iput(nilfs->ns_dat); 338 iput(nilfs->ns_dat);
376 339
377 failed: 340 failed:
378 nilfs_clear_recovery_info(&ri); 341 nilfs_clear_recovery_info(&ri);
379 sb->s_flags = s_flags; 342 sb->s_flags = s_flags;
380 return err; 343 return err;
381 } 344 }
382 345
383 static unsigned long long nilfs_max_size(unsig 346 static unsigned long long nilfs_max_size(unsigned int blkbits)
384 { 347 {
385 unsigned int max_bits; 348 unsigned int max_bits;
386 unsigned long long res = MAX_LFS_FILES 349 unsigned long long res = MAX_LFS_FILESIZE; /* page cache limit */
387 350
388 max_bits = blkbits + NILFS_BMAP_KEY_BI 351 max_bits = blkbits + NILFS_BMAP_KEY_BIT; /* bmap size limit */
389 if (max_bits < 64) 352 if (max_bits < 64)
390 res = min_t(unsigned long long 353 res = min_t(unsigned long long, res, (1ULL << max_bits) - 1);
391 return res; 354 return res;
392 } 355 }
393 356
394 /** 357 /**
395 * nilfs_nrsvsegs - calculate the number of re 358 * nilfs_nrsvsegs - calculate the number of reserved segments
396 * @nilfs: nilfs object 359 * @nilfs: nilfs object
397 * @nsegs: total number of segments 360 * @nsegs: total number of segments
398 */ 361 */
399 unsigned long nilfs_nrsvsegs(struct the_nilfs 362 unsigned long nilfs_nrsvsegs(struct the_nilfs *nilfs, unsigned long nsegs)
400 { 363 {
401 return max_t(unsigned long, NILFS_MIN_ 364 return max_t(unsigned long, NILFS_MIN_NRSVSEGS,
402 DIV_ROUND_UP(nsegs * nilf 365 DIV_ROUND_UP(nsegs * nilfs->ns_r_segments_percentage,
403 100)); 366 100));
404 } 367 }
405 368
406 /** <<
407 * nilfs_max_segment_count - calculate the max <<
408 * @nilfs: nilfs object <<
409 */ <<
410 static u64 nilfs_max_segment_count(struct the_ <<
411 { <<
412 u64 max_count = U64_MAX; <<
413 <<
414 max_count = div64_ul(max_count, nilfs- <<
415 return min_t(u64, max_count, ULONG_MAX <<
416 } <<
417 <<
418 void nilfs_set_nsegments(struct the_nilfs *nil 369 void nilfs_set_nsegments(struct the_nilfs *nilfs, unsigned long nsegs)
419 { 370 {
420 nilfs->ns_nsegments = nsegs; 371 nilfs->ns_nsegments = nsegs;
421 nilfs->ns_nrsvsegs = nilfs_nrsvsegs(ni 372 nilfs->ns_nrsvsegs = nilfs_nrsvsegs(nilfs, nsegs);
422 } 373 }
423 374
424 static int nilfs_store_disk_layout(struct the_ 375 static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
425 struct nilf 376 struct nilfs_super_block *sbp)
426 { 377 {
427 u64 nsegments, nblocks; <<
428 <<
429 if (le32_to_cpu(sbp->s_rev_level) < NI 378 if (le32_to_cpu(sbp->s_rev_level) < NILFS_MIN_SUPP_REV) {
430 nilfs_err(nilfs->ns_sb, 379 nilfs_err(nilfs->ns_sb,
431 "unsupported revisio 380 "unsupported revision (superblock rev.=%d.%d, current rev.=%d.%d). Please check the version of mkfs.nilfs(2).",
432 le32_to_cpu(sbp->s_r 381 le32_to_cpu(sbp->s_rev_level),
433 le16_to_cpu(sbp->s_m 382 le16_to_cpu(sbp->s_minor_rev_level),
434 NILFS_CURRENT_REV, N 383 NILFS_CURRENT_REV, NILFS_MINOR_REV);
435 return -EINVAL; 384 return -EINVAL;
436 } 385 }
437 nilfs->ns_sbsize = le16_to_cpu(sbp->s_ 386 nilfs->ns_sbsize = le16_to_cpu(sbp->s_bytes);
438 if (nilfs->ns_sbsize > BLOCK_SIZE) 387 if (nilfs->ns_sbsize > BLOCK_SIZE)
439 return -EINVAL; 388 return -EINVAL;
440 389
441 nilfs->ns_inode_size = le16_to_cpu(sbp 390 nilfs->ns_inode_size = le16_to_cpu(sbp->s_inode_size);
442 if (nilfs->ns_inode_size > nilfs->ns_b 391 if (nilfs->ns_inode_size > nilfs->ns_blocksize) {
443 nilfs_err(nilfs->ns_sb, "too l 392 nilfs_err(nilfs->ns_sb, "too large inode size: %d bytes",
444 nilfs->ns_inode_size 393 nilfs->ns_inode_size);
445 return -EINVAL; 394 return -EINVAL;
446 } else if (nilfs->ns_inode_size < NILF 395 } else if (nilfs->ns_inode_size < NILFS_MIN_INODE_SIZE) {
447 nilfs_err(nilfs->ns_sb, "too s 396 nilfs_err(nilfs->ns_sb, "too small inode size: %d bytes",
448 nilfs->ns_inode_size 397 nilfs->ns_inode_size);
449 return -EINVAL; 398 return -EINVAL;
450 } 399 }
451 400
452 nilfs->ns_first_ino = le32_to_cpu(sbp- 401 nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino);
453 if (nilfs->ns_first_ino < NILFS_USER_I <<
454 nilfs_err(nilfs->ns_sb, <<
455 "too small lower lim <<
456 nilfs->ns_first_ino) <<
457 return -EINVAL; <<
458 } <<
459 402
460 nilfs->ns_blocks_per_segment = le32_to 403 nilfs->ns_blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment);
461 if (nilfs->ns_blocks_per_segment < NIL 404 if (nilfs->ns_blocks_per_segment < NILFS_SEG_MIN_BLOCKS) {
462 nilfs_err(nilfs->ns_sb, "too s 405 nilfs_err(nilfs->ns_sb, "too short segment: %lu blocks",
463 nilfs->ns_blocks_per 406 nilfs->ns_blocks_per_segment);
464 return -EINVAL; 407 return -EINVAL;
465 } 408 }
466 409
467 nilfs->ns_first_data_block = le64_to_c 410 nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
468 nilfs->ns_r_segments_percentage = 411 nilfs->ns_r_segments_percentage =
469 le32_to_cpu(sbp->s_r_segments_ 412 le32_to_cpu(sbp->s_r_segments_percentage);
470 if (nilfs->ns_r_segments_percentage < 413 if (nilfs->ns_r_segments_percentage < 1 ||
471 nilfs->ns_r_segments_percentage > 414 nilfs->ns_r_segments_percentage > 99) {
472 nilfs_err(nilfs->ns_sb, 415 nilfs_err(nilfs->ns_sb,
473 "invalid reserved se 416 "invalid reserved segments percentage: %lu",
474 nilfs->ns_r_segments 417 nilfs->ns_r_segments_percentage);
475 return -EINVAL; 418 return -EINVAL;
476 } 419 }
477 420
478 nsegments = le64_to_cpu(sbp->s_nsegmen !! 421 nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
479 if (nsegments > nilfs_max_segment_coun <<
480 nilfs_err(nilfs->ns_sb, <<
481 "segment count %llu <<
482 (unsigned long long) <<
483 (unsigned long long) <<
484 return -EINVAL; <<
485 } <<
486 <<
487 nblocks = sb_bdev_nr_blocks(nilfs->ns_ <<
488 if (nblocks) { <<
489 u64 min_block_count = nsegment <<
490 /* <<
491 * To avoid failing to mount e <<
492 * second superblock, exclude <<
493 * "min_block_count" calculati <<
494 */ <<
495 <<
496 if (nblocks < min_block_count) <<
497 nilfs_err(nilfs->ns_sb <<
498 "total numbe <<
499 (unsigned lo <<
500 (unsigned lo <<
501 return -EINVAL; <<
502 } <<
503 } <<
504 <<
505 nilfs_set_nsegments(nilfs, nsegments); <<
506 nilfs->ns_crc_seed = le32_to_cpu(sbp-> 422 nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
507 return 0; 423 return 0;
508 } 424 }
509 425
510 static int nilfs_valid_sb(struct nilfs_super_b 426 static int nilfs_valid_sb(struct nilfs_super_block *sbp)
511 { 427 {
512 static unsigned char sum[4]; 428 static unsigned char sum[4];
513 const int sumoff = offsetof(struct nil 429 const int sumoff = offsetof(struct nilfs_super_block, s_sum);
514 size_t bytes; 430 size_t bytes;
515 u32 crc; 431 u32 crc;
516 432
517 if (!sbp || le16_to_cpu(sbp->s_magic) 433 if (!sbp || le16_to_cpu(sbp->s_magic) != NILFS_SUPER_MAGIC)
518 return 0; 434 return 0;
519 bytes = le16_to_cpu(sbp->s_bytes); 435 bytes = le16_to_cpu(sbp->s_bytes);
520 if (bytes < sumoff + 4 || bytes > BLOC 436 if (bytes < sumoff + 4 || bytes > BLOCK_SIZE)
521 return 0; 437 return 0;
522 crc = crc32_le(le32_to_cpu(sbp->s_crc_ 438 crc = crc32_le(le32_to_cpu(sbp->s_crc_seed), (unsigned char *)sbp,
523 sumoff); 439 sumoff);
524 crc = crc32_le(crc, sum, 4); 440 crc = crc32_le(crc, sum, 4);
525 crc = crc32_le(crc, (unsigned char *)s 441 crc = crc32_le(crc, (unsigned char *)sbp + sumoff + 4,
526 bytes - sumoff - 4); 442 bytes - sumoff - 4);
527 return crc == le32_to_cpu(sbp->s_sum); 443 return crc == le32_to_cpu(sbp->s_sum);
528 } 444 }
529 445
530 /** !! 446 static int nilfs_sb2_bad_offset(struct nilfs_super_block *sbp, u64 offset)
531 * nilfs_sb2_bad_offset - check the location o <<
532 * @sbp: superblock raw data buffer <<
533 * @offset: byte offset of second superblock c <<
534 * <<
535 * nilfs_sb2_bad_offset() checks if the positi <<
536 * superblock is valid or not based on the fil <<
537 * stored in @sbp. If @offset points to a loc <<
538 * area, or if the parameters themselves are n <<
539 * determined to be invalid. <<
540 * <<
541 * Return Value: true if invalid, false if val <<
542 */ <<
543 static bool nilfs_sb2_bad_offset(struct nilfs_ <<
544 { 447 {
545 unsigned int shift_bits = le32_to_cpu( !! 448 return offset < ((le64_to_cpu(sbp->s_nsegments) *
546 u32 blocks_per_segment = le32_to_cpu(s !! 449 le32_to_cpu(sbp->s_blocks_per_segment)) <<
547 u64 nsegments = le64_to_cpu(sbp->s_nse !! 450 (le32_to_cpu(sbp->s_log_block_size) + 10));
548 u64 index; <<
549 <<
550 if (blocks_per_segment < NILFS_SEG_MIN <<
551 shift_bits > ilog2(NILFS_MAX_BLOCK <<
552 return true; <<
553 <<
554 index = offset >> (shift_bits + BLOCK_ <<
555 do_div(index, blocks_per_segment); <<
556 return index < nsegments; <<
557 } 451 }
558 452
559 static void nilfs_release_super_block(struct t 453 static void nilfs_release_super_block(struct the_nilfs *nilfs)
560 { 454 {
561 int i; 455 int i;
562 456
563 for (i = 0; i < 2; i++) { 457 for (i = 0; i < 2; i++) {
564 if (nilfs->ns_sbp[i]) { 458 if (nilfs->ns_sbp[i]) {
565 brelse(nilfs->ns_sbh[i 459 brelse(nilfs->ns_sbh[i]);
566 nilfs->ns_sbh[i] = NUL 460 nilfs->ns_sbh[i] = NULL;
567 nilfs->ns_sbp[i] = NUL 461 nilfs->ns_sbp[i] = NULL;
568 } 462 }
569 } 463 }
570 } 464 }
571 465
572 void nilfs_fall_back_super_block(struct the_ni 466 void nilfs_fall_back_super_block(struct the_nilfs *nilfs)
573 { 467 {
574 brelse(nilfs->ns_sbh[0]); 468 brelse(nilfs->ns_sbh[0]);
575 nilfs->ns_sbh[0] = nilfs->ns_sbh[1]; 469 nilfs->ns_sbh[0] = nilfs->ns_sbh[1];
576 nilfs->ns_sbp[0] = nilfs->ns_sbp[1]; 470 nilfs->ns_sbp[0] = nilfs->ns_sbp[1];
577 nilfs->ns_sbh[1] = NULL; 471 nilfs->ns_sbh[1] = NULL;
578 nilfs->ns_sbp[1] = NULL; 472 nilfs->ns_sbp[1] = NULL;
579 } 473 }
580 474
581 void nilfs_swap_super_block(struct the_nilfs * 475 void nilfs_swap_super_block(struct the_nilfs *nilfs)
582 { 476 {
583 struct buffer_head *tsbh = nilfs->ns_s 477 struct buffer_head *tsbh = nilfs->ns_sbh[0];
584 struct nilfs_super_block *tsbp = nilfs 478 struct nilfs_super_block *tsbp = nilfs->ns_sbp[0];
585 479
586 nilfs->ns_sbh[0] = nilfs->ns_sbh[1]; 480 nilfs->ns_sbh[0] = nilfs->ns_sbh[1];
587 nilfs->ns_sbp[0] = nilfs->ns_sbp[1]; 481 nilfs->ns_sbp[0] = nilfs->ns_sbp[1];
588 nilfs->ns_sbh[1] = tsbh; 482 nilfs->ns_sbh[1] = tsbh;
589 nilfs->ns_sbp[1] = tsbp; 483 nilfs->ns_sbp[1] = tsbp;
590 } 484 }
591 485
592 static int nilfs_load_super_block(struct the_n 486 static int nilfs_load_super_block(struct the_nilfs *nilfs,
593 struct super 487 struct super_block *sb, int blocksize,
594 struct nilfs 488 struct nilfs_super_block **sbpp)
595 { 489 {
596 struct nilfs_super_block **sbp = nilfs 490 struct nilfs_super_block **sbp = nilfs->ns_sbp;
597 struct buffer_head **sbh = nilfs->ns_s 491 struct buffer_head **sbh = nilfs->ns_sbh;
598 u64 sb2off, devsize = bdev_nr_bytes(ni !! 492 u64 sb2off = NILFS_SB2_OFFSET_BYTES(bdev_nr_bytes(nilfs->ns_bdev));
599 int valid[2], swp = 0, older; !! 493 int valid[2], swp = 0;
600 <<
601 if (devsize < NILFS_SEG_MIN_BLOCKS * N <<
602 nilfs_err(sb, "device size too <<
603 return -EINVAL; <<
604 } <<
605 sb2off = NILFS_SB2_OFFSET_BYTES(devsiz <<
606 494
607 sbp[0] = nilfs_read_super_block(sb, NI 495 sbp[0] = nilfs_read_super_block(sb, NILFS_SB_OFFSET_BYTES, blocksize,
608 &sbh[0 496 &sbh[0]);
609 sbp[1] = nilfs_read_super_block(sb, sb 497 sbp[1] = nilfs_read_super_block(sb, sb2off, blocksize, &sbh[1]);
610 498
611 if (!sbp[0]) { 499 if (!sbp[0]) {
612 if (!sbp[1]) { 500 if (!sbp[1]) {
613 nilfs_err(sb, "unable 501 nilfs_err(sb, "unable to read superblock");
614 return -EIO; 502 return -EIO;
615 } 503 }
616 nilfs_warn(sb, 504 nilfs_warn(sb,
617 "unable to read pri 505 "unable to read primary superblock (blocksize = %d)",
618 blocksize); 506 blocksize);
619 } else if (!sbp[1]) { 507 } else if (!sbp[1]) {
620 nilfs_warn(sb, 508 nilfs_warn(sb,
621 "unable to read sec 509 "unable to read secondary superblock (blocksize = %d)",
622 blocksize); 510 blocksize);
623 } 511 }
624 512
625 /* 513 /*
626 * Compare two super blocks and set 1 514 * Compare two super blocks and set 1 in swp if the secondary
627 * super block is valid and newer. Ot 515 * super block is valid and newer. Otherwise, set 0 in swp.
628 */ 516 */
629 valid[0] = nilfs_valid_sb(sbp[0]); 517 valid[0] = nilfs_valid_sb(sbp[0]);
630 valid[1] = nilfs_valid_sb(sbp[1]); 518 valid[1] = nilfs_valid_sb(sbp[1]);
631 swp = valid[1] && (!valid[0] || 519 swp = valid[1] && (!valid[0] ||
632 le64_to_cpu(sbp[1]- 520 le64_to_cpu(sbp[1]->s_last_cno) >
633 le64_to_cpu(sbp[0]- 521 le64_to_cpu(sbp[0]->s_last_cno));
634 522
635 if (valid[swp] && nilfs_sb2_bad_offset 523 if (valid[swp] && nilfs_sb2_bad_offset(sbp[swp], sb2off)) {
636 brelse(sbh[1]); 524 brelse(sbh[1]);
637 sbh[1] = NULL; 525 sbh[1] = NULL;
638 sbp[1] = NULL; 526 sbp[1] = NULL;
639 valid[1] = 0; 527 valid[1] = 0;
640 swp = 0; 528 swp = 0;
641 } 529 }
642 if (!valid[swp]) { 530 if (!valid[swp]) {
643 nilfs_release_super_block(nilf 531 nilfs_release_super_block(nilfs);
644 nilfs_err(sb, "couldn't find n 532 nilfs_err(sb, "couldn't find nilfs on the device");
645 return -EINVAL; 533 return -EINVAL;
646 } 534 }
647 535
648 if (!valid[!swp]) 536 if (!valid[!swp])
649 nilfs_warn(sb, 537 nilfs_warn(sb,
650 "broken superblock, 538 "broken superblock, retrying with spare superblock (blocksize = %d)",
651 blocksize); 539 blocksize);
652 if (swp) 540 if (swp)
653 nilfs_swap_super_block(nilfs); 541 nilfs_swap_super_block(nilfs);
654 542
655 /* <<
656 * Calculate the array index of the ol <<
657 * If one has been dropped, set index <<
658 * otherwise set index 1 pointing to t <<
659 * are the same). <<
660 * <<
661 * Divided case valid[0] <<
662 * ---------------------------------- <<
663 * Both SBs are invalid 0 <<
664 * SB1 is invalid 0 <<
665 * SB2 is invalid 1 <<
666 * SB2 is newer 1 <<
667 * SB2 is older or the same 1 <<
668 */ <<
669 older = valid[1] ^ swp; <<
670 <<
671 nilfs->ns_sbwcount = 0; 543 nilfs->ns_sbwcount = 0;
672 nilfs->ns_sbwtime = le64_to_cpu(sbp[0] 544 nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime);
673 nilfs->ns_prot_seq = le64_to_cpu(sbp[o !! 545 nilfs->ns_prot_seq = le64_to_cpu(sbp[valid[1] & !swp]->s_last_seq);
674 *sbpp = sbp[0]; 546 *sbpp = sbp[0];
675 return 0; 547 return 0;
676 } 548 }
677 549
678 /** 550 /**
679 * init_nilfs - initialize a NILFS instance. 551 * init_nilfs - initialize a NILFS instance.
680 * @nilfs: the_nilfs structure 552 * @nilfs: the_nilfs structure
681 * @sb: super block 553 * @sb: super block
>> 554 * @data: mount options
682 * 555 *
683 * init_nilfs() performs common initialization 556 * init_nilfs() performs common initialization per block device (e.g.
684 * reading the super block, getting disk layou 557 * reading the super block, getting disk layout information, initializing
685 * shared fields in the_nilfs). 558 * shared fields in the_nilfs).
686 * 559 *
687 * Return Value: On success, 0 is returned. On 560 * Return Value: On success, 0 is returned. On error, a negative error
688 * code is returned. 561 * code is returned.
689 */ 562 */
690 int init_nilfs(struct the_nilfs *nilfs, struct !! 563 int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data)
691 { 564 {
692 struct nilfs_super_block *sbp; 565 struct nilfs_super_block *sbp;
693 int blocksize; 566 int blocksize;
694 int err; 567 int err;
695 568
696 down_write(&nilfs->ns_sem); 569 down_write(&nilfs->ns_sem);
697 570
698 blocksize = sb_min_blocksize(sb, NILFS 571 blocksize = sb_min_blocksize(sb, NILFS_MIN_BLOCK_SIZE);
699 if (!blocksize) { 572 if (!blocksize) {
700 nilfs_err(sb, "unable to set b 573 nilfs_err(sb, "unable to set blocksize");
701 err = -EINVAL; 574 err = -EINVAL;
702 goto out; 575 goto out;
703 } 576 }
704 err = nilfs_load_super_block(nilfs, sb 577 err = nilfs_load_super_block(nilfs, sb, blocksize, &sbp);
705 if (err) 578 if (err)
706 goto out; 579 goto out;
707 580
708 err = nilfs_store_magic(sb, sbp); !! 581 err = nilfs_store_magic_and_option(sb, sbp, data);
709 if (err) 582 if (err)
710 goto failed_sbh; 583 goto failed_sbh;
711 584
712 err = nilfs_check_feature_compatibilit 585 err = nilfs_check_feature_compatibility(sb, sbp);
713 if (err) 586 if (err)
714 goto failed_sbh; 587 goto failed_sbh;
715 588
716 err = nilfs_get_blocksize(sb, sbp, &bl !! 589 blocksize = BLOCK_SIZE << le32_to_cpu(sbp->s_log_block_size);
717 if (err) !! 590 if (blocksize < NILFS_MIN_BLOCK_SIZE ||
718 goto failed_sbh; !! 591 blocksize > NILFS_MAX_BLOCK_SIZE) {
719 <<
720 if (blocksize < NILFS_MIN_BLOCK_SIZE) <<
721 nilfs_err(sb, 592 nilfs_err(sb,
722 "couldn't mount beca 593 "couldn't mount because of unsupported filesystem blocksize %d",
723 blocksize); 594 blocksize);
724 err = -EINVAL; 595 err = -EINVAL;
725 goto failed_sbh; 596 goto failed_sbh;
726 } 597 }
727 if (sb->s_blocksize != blocksize) { 598 if (sb->s_blocksize != blocksize) {
728 int hw_blocksize = bdev_logica 599 int hw_blocksize = bdev_logical_block_size(sb->s_bdev);
729 600
730 if (blocksize < hw_blocksize) 601 if (blocksize < hw_blocksize) {
731 nilfs_err(sb, 602 nilfs_err(sb,
732 "blocksize % 603 "blocksize %d too small for device (sector-size = %d)",
733 blocksize, h 604 blocksize, hw_blocksize);
734 err = -EINVAL; 605 err = -EINVAL;
735 goto failed_sbh; 606 goto failed_sbh;
736 } 607 }
737 nilfs_release_super_block(nilf 608 nilfs_release_super_block(nilfs);
738 if (!sb_set_blocksize(sb, bloc !! 609 sb_set_blocksize(sb, blocksize);
739 nilfs_err(sb, "bad blo <<
740 err = -EINVAL; <<
741 goto out; <<
742 } <<
743 610
744 err = nilfs_load_super_block(n 611 err = nilfs_load_super_block(nilfs, sb, blocksize, &sbp);
745 if (err) 612 if (err)
746 goto out; 613 goto out;
747 /* 614 /*
748 * Not to failed_sbh; 615 * Not to failed_sbh; sbh is released automatically
749 * when reloading fail 616 * when reloading fails.
750 */ 617 */
751 } 618 }
752 nilfs->ns_blocksize_bits = sb->s_block 619 nilfs->ns_blocksize_bits = sb->s_blocksize_bits;
753 nilfs->ns_blocksize = blocksize; 620 nilfs->ns_blocksize = blocksize;
754 621
>> 622 get_random_bytes(&nilfs->ns_next_generation,
>> 623 sizeof(nilfs->ns_next_generation));
>> 624
755 err = nilfs_store_disk_layout(nilfs, s 625 err = nilfs_store_disk_layout(nilfs, sbp);
756 if (err) 626 if (err)
757 goto failed_sbh; 627 goto failed_sbh;
758 628
759 sb->s_maxbytes = nilfs_max_size(sb->s_ 629 sb->s_maxbytes = nilfs_max_size(sb->s_blocksize_bits);
760 630
761 nilfs->ns_mount_state = le16_to_cpu(sb 631 nilfs->ns_mount_state = le16_to_cpu(sbp->s_state);
762 632
763 err = nilfs_store_log_cursor(nilfs, sb 633 err = nilfs_store_log_cursor(nilfs, sbp);
764 if (err) 634 if (err)
765 goto failed_sbh; 635 goto failed_sbh;
766 636
>> 637 err = nilfs_sysfs_create_device_group(sb);
>> 638 if (err)
>> 639 goto failed_sbh;
>> 640
767 set_nilfs_init(nilfs); 641 set_nilfs_init(nilfs);
768 err = 0; 642 err = 0;
769 out: 643 out:
770 up_write(&nilfs->ns_sem); 644 up_write(&nilfs->ns_sem);
771 return err; 645 return err;
772 646
773 failed_sbh: 647 failed_sbh:
774 nilfs_release_super_block(nilfs); 648 nilfs_release_super_block(nilfs);
775 goto out; 649 goto out;
776 } 650 }
777 651
778 int nilfs_discard_segments(struct the_nilfs *n 652 int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump,
779 size_t nsegs) 653 size_t nsegs)
780 { 654 {
781 sector_t seg_start, seg_end; 655 sector_t seg_start, seg_end;
782 sector_t start = 0, nblocks = 0; 656 sector_t start = 0, nblocks = 0;
783 unsigned int sects_per_block; 657 unsigned int sects_per_block;
784 __u64 *sn; 658 __u64 *sn;
785 int ret = 0; 659 int ret = 0;
786 660
787 sects_per_block = (1 << nilfs->ns_bloc 661 sects_per_block = (1 << nilfs->ns_blocksize_bits) /
788 bdev_logical_block_size(nilfs- 662 bdev_logical_block_size(nilfs->ns_bdev);
789 for (sn = segnump; sn < segnump + nseg 663 for (sn = segnump; sn < segnump + nsegs; sn++) {
790 nilfs_get_segment_range(nilfs, 664 nilfs_get_segment_range(nilfs, *sn, &seg_start, &seg_end);
791 665
792 if (!nblocks) { 666 if (!nblocks) {
793 start = seg_start; 667 start = seg_start;
794 nblocks = seg_end - se 668 nblocks = seg_end - seg_start + 1;
795 } else if (start + nblocks == 669 } else if (start + nblocks == seg_start) {
796 nblocks += seg_end - s 670 nblocks += seg_end - seg_start + 1;
797 } else { 671 } else {
798 ret = blkdev_issue_dis 672 ret = blkdev_issue_discard(nilfs->ns_bdev,
799 673 start * sects_per_block,
800 674 nblocks * sects_per_block,
801 675 GFP_NOFS);
802 if (ret < 0) 676 if (ret < 0)
803 return ret; 677 return ret;
804 nblocks = 0; 678 nblocks = 0;
805 } 679 }
806 } 680 }
807 if (nblocks) 681 if (nblocks)
808 ret = blkdev_issue_discard(nil 682 ret = blkdev_issue_discard(nilfs->ns_bdev,
809 sta 683 start * sects_per_block,
810 nbl 684 nblocks * sects_per_block,
811 GFP 685 GFP_NOFS);
812 return ret; 686 return ret;
813 } 687 }
814 688
815 int nilfs_count_free_blocks(struct the_nilfs * 689 int nilfs_count_free_blocks(struct the_nilfs *nilfs, sector_t *nblocks)
816 { 690 {
817 unsigned long ncleansegs; 691 unsigned long ncleansegs;
818 692
>> 693 down_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem);
819 ncleansegs = nilfs_sufile_get_ncleanse 694 ncleansegs = nilfs_sufile_get_ncleansegs(nilfs->ns_sufile);
>> 695 up_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem);
820 *nblocks = (sector_t)ncleansegs * nilf 696 *nblocks = (sector_t)ncleansegs * nilfs->ns_blocks_per_segment;
821 return 0; 697 return 0;
822 } 698 }
823 699
824 int nilfs_near_disk_full(struct the_nilfs *nil 700 int nilfs_near_disk_full(struct the_nilfs *nilfs)
825 { 701 {
826 unsigned long ncleansegs, nincsegs; 702 unsigned long ncleansegs, nincsegs;
827 703
828 ncleansegs = nilfs_sufile_get_ncleanse 704 ncleansegs = nilfs_sufile_get_ncleansegs(nilfs->ns_sufile);
829 nincsegs = atomic_read(&nilfs->ns_ndir 705 nincsegs = atomic_read(&nilfs->ns_ndirtyblks) /
830 nilfs->ns_blocks_per_segment + 706 nilfs->ns_blocks_per_segment + 1;
831 707
832 return ncleansegs <= nilfs->ns_nrsvseg 708 return ncleansegs <= nilfs->ns_nrsvsegs + nincsegs;
833 } 709 }
834 710
835 struct nilfs_root *nilfs_lookup_root(struct th 711 struct nilfs_root *nilfs_lookup_root(struct the_nilfs *nilfs, __u64 cno)
836 { 712 {
837 struct rb_node *n; 713 struct rb_node *n;
838 struct nilfs_root *root; 714 struct nilfs_root *root;
839 715
840 spin_lock(&nilfs->ns_cptree_lock); 716 spin_lock(&nilfs->ns_cptree_lock);
841 n = nilfs->ns_cptree.rb_node; 717 n = nilfs->ns_cptree.rb_node;
842 while (n) { 718 while (n) {
843 root = rb_entry(n, struct nilf 719 root = rb_entry(n, struct nilfs_root, rb_node);
844 720
845 if (cno < root->cno) { 721 if (cno < root->cno) {
846 n = n->rb_left; 722 n = n->rb_left;
847 } else if (cno > root->cno) { 723 } else if (cno > root->cno) {
848 n = n->rb_right; 724 n = n->rb_right;
849 } else { 725 } else {
850 refcount_inc(&root->co 726 refcount_inc(&root->count);
851 spin_unlock(&nilfs->ns 727 spin_unlock(&nilfs->ns_cptree_lock);
852 return root; 728 return root;
853 } 729 }
854 } 730 }
855 spin_unlock(&nilfs->ns_cptree_lock); 731 spin_unlock(&nilfs->ns_cptree_lock);
856 732
857 return NULL; 733 return NULL;
858 } 734 }
859 735
860 struct nilfs_root * 736 struct nilfs_root *
861 nilfs_find_or_create_root(struct the_nilfs *ni 737 nilfs_find_or_create_root(struct the_nilfs *nilfs, __u64 cno)
862 { 738 {
863 struct rb_node **p, *parent; 739 struct rb_node **p, *parent;
864 struct nilfs_root *root, *new; 740 struct nilfs_root *root, *new;
865 int err; 741 int err;
866 742
867 root = nilfs_lookup_root(nilfs, cno); 743 root = nilfs_lookup_root(nilfs, cno);
868 if (root) 744 if (root)
869 return root; 745 return root;
870 746
871 new = kzalloc(sizeof(*root), GFP_KERNE 747 new = kzalloc(sizeof(*root), GFP_KERNEL);
872 if (!new) 748 if (!new)
873 return NULL; 749 return NULL;
874 750
875 spin_lock(&nilfs->ns_cptree_lock); 751 spin_lock(&nilfs->ns_cptree_lock);
876 752
877 p = &nilfs->ns_cptree.rb_node; 753 p = &nilfs->ns_cptree.rb_node;
878 parent = NULL; 754 parent = NULL;
879 755
880 while (*p) { 756 while (*p) {
881 parent = *p; 757 parent = *p;
882 root = rb_entry(parent, struct 758 root = rb_entry(parent, struct nilfs_root, rb_node);
883 759
884 if (cno < root->cno) { 760 if (cno < root->cno) {
885 p = &(*p)->rb_left; 761 p = &(*p)->rb_left;
886 } else if (cno > root->cno) { 762 } else if (cno > root->cno) {
887 p = &(*p)->rb_right; 763 p = &(*p)->rb_right;
888 } else { 764 } else {
889 refcount_inc(&root->co 765 refcount_inc(&root->count);
890 spin_unlock(&nilfs->ns 766 spin_unlock(&nilfs->ns_cptree_lock);
891 kfree(new); 767 kfree(new);
892 return root; 768 return root;
893 } 769 }
894 } 770 }
895 771
896 new->cno = cno; 772 new->cno = cno;
897 new->ifile = NULL; 773 new->ifile = NULL;
898 new->nilfs = nilfs; 774 new->nilfs = nilfs;
899 refcount_set(&new->count, 1); 775 refcount_set(&new->count, 1);
900 atomic64_set(&new->inodes_count, 0); 776 atomic64_set(&new->inodes_count, 0);
901 atomic64_set(&new->blocks_count, 0); 777 atomic64_set(&new->blocks_count, 0);
902 778
903 rb_link_node(&new->rb_node, parent, p) 779 rb_link_node(&new->rb_node, parent, p);
904 rb_insert_color(&new->rb_node, &nilfs- 780 rb_insert_color(&new->rb_node, &nilfs->ns_cptree);
905 781
906 spin_unlock(&nilfs->ns_cptree_lock); 782 spin_unlock(&nilfs->ns_cptree_lock);
907 783
908 err = nilfs_sysfs_create_snapshot_grou 784 err = nilfs_sysfs_create_snapshot_group(new);
909 if (err) { 785 if (err) {
910 kfree(new); 786 kfree(new);
911 new = NULL; 787 new = NULL;
912 } 788 }
913 789
914 return new; 790 return new;
915 } 791 }
916 792
917 void nilfs_put_root(struct nilfs_root *root) 793 void nilfs_put_root(struct nilfs_root *root)
918 { 794 {
919 struct the_nilfs *nilfs = root->nilfs; 795 struct the_nilfs *nilfs = root->nilfs;
920 796
921 if (refcount_dec_and_lock(&root->count 797 if (refcount_dec_and_lock(&root->count, &nilfs->ns_cptree_lock)) {
922 rb_erase(&root->rb_node, &nilf 798 rb_erase(&root->rb_node, &nilfs->ns_cptree);
923 spin_unlock(&nilfs->ns_cptree_ 799 spin_unlock(&nilfs->ns_cptree_lock);
924 800
925 nilfs_sysfs_delete_snapshot_gr 801 nilfs_sysfs_delete_snapshot_group(root);
926 iput(root->ifile); 802 iput(root->ifile);
927 803
928 kfree(root); 804 kfree(root);
929 } 805 }
930 } 806 }
931 807
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.