the_nilfs.c (4138ec23820012009aecc2b02856c62872dd3c34) the_nilfs.c (3b2ce58b0f3c1633750529713be0e467282abd78)
1/*
2 * the_nilfs.c - the_nilfs shared structure.
3 *
4 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or

--- 269 unchanged lines hidden (view full) ---

278 }
279
280 if (valid_fs)
281 goto skip_recovery;
282
283 if (s_flags & MS_RDONLY) {
284 __u64 features;
285
1/*
2 * the_nilfs.c - the_nilfs shared structure.
3 *
4 * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or

--- 269 unchanged lines hidden (view full) ---

278 }
279
280 if (valid_fs)
281 goto skip_recovery;
282
283 if (s_flags & MS_RDONLY) {
284 __u64 features;
285
286 if (nilfs_test_opt(sbi, NORECOVERY)) {
286 if (nilfs_test_opt(nilfs, NORECOVERY)) {
287 printk(KERN_INFO "NILFS: norecovery option specified. "
288 "skipping roll-forward recovery\n");
289 goto skip_recovery;
290 }
291 features = le64_to_cpu(nilfs->ns_sbp[0]->s_feature_compat_ro) &
292 ~NILFS_FEATURE_COMPAT_RO_SUPP;
293 if (features) {
294 printk(KERN_ERR "NILFS: couldn't proceed with "

--- 5 unchanged lines hidden (view full) ---

300 }
301 if (really_read_only) {
302 printk(KERN_ERR "NILFS: write access "
303 "unavailable, cannot proceed.\n");
304 err = -EROFS;
305 goto failed_unload;
306 }
307 sbi->s_super->s_flags &= ~MS_RDONLY;
287 printk(KERN_INFO "NILFS: norecovery option specified. "
288 "skipping roll-forward recovery\n");
289 goto skip_recovery;
290 }
291 features = le64_to_cpu(nilfs->ns_sbp[0]->s_feature_compat_ro) &
292 ~NILFS_FEATURE_COMPAT_RO_SUPP;
293 if (features) {
294 printk(KERN_ERR "NILFS: couldn't proceed with "

--- 5 unchanged lines hidden (view full) ---

300 }
301 if (really_read_only) {
302 printk(KERN_ERR "NILFS: write access "
303 "unavailable, cannot proceed.\n");
304 err = -EROFS;
305 goto failed_unload;
306 }
307 sbi->s_super->s_flags &= ~MS_RDONLY;
308 } else if (nilfs_test_opt(sbi, NORECOVERY)) {
308 } else if (nilfs_test_opt(nilfs, NORECOVERY)) {
309 printk(KERN_ERR "NILFS: recovery cancelled because norecovery "
310 "option was specified for a read/write mount\n");
311 err = -EINVAL;
312 goto failed_unload;
313 }
314
315 err = nilfs_salvage_orphan_logs(nilfs, sbi, &ri);
316 if (err)

--- 448 unchanged lines hidden --- 		309 printk(KERN_ERR "NILFS: recovery cancelled because norecovery "
310 "option was specified for a read/write mount\n");
311 err = -EINVAL;
312 goto failed_unload;
313 }
314
315 err = nilfs_salvage_orphan_logs(nilfs, sbi, &ri);
316 if (err)

--- 448 unchanged lines hidden ---