| journal.c (9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a) | journal.c (0718afd47f70cf46877c39c25d06b786e1a3f36c) |
|---|---|
| 1// SPDX-License-Identifier: GPL-2.0 2/* 3 * Write ahead logging implementation copyright Chris Mason 2000 4 * 5 * The background commits make this code very interrelated, and 6 * overly complex. I need to rethink things a bit....The major players: 7 * 8 * journal_begin -- call with the number of blocks you expect to log. --- 2602 unchanged lines hidden (view full) --- 2611 if (bdev_read_only(super->s_bdev)) 2612 blkdev_mode = FMODE_READ; 2613 2614 /* there is no "jdev" option and journal is on separate device */ 2615 if ((!jdev_name || !jdev_name[0])) { 2616 if (jdev == super->s_dev) 2617 blkdev_mode &= ~FMODE_EXCL; 2618 journal->j_dev_bd = blkdev_get_by_dev(jdev, blkdev_mode, | 1// SPDX-License-Identifier: GPL-2.0 2/* 3 * Write ahead logging implementation copyright Chris Mason 2000 4 * 5 * The background commits make this code very interrelated, and 6 * overly complex. I need to rethink things a bit....The major players: 7 * 8 * journal_begin -- call with the number of blocks you expect to log. --- 2602 unchanged lines hidden (view full) --- 2611 if (bdev_read_only(super->s_bdev)) 2612 blkdev_mode = FMODE_READ; 2613 2614 /* there is no "jdev" option and journal is on separate device */ 2615 if ((!jdev_name || !jdev_name[0])) { 2616 if (jdev == super->s_dev) 2617 blkdev_mode &= ~FMODE_EXCL; 2618 journal->j_dev_bd = blkdev_get_by_dev(jdev, blkdev_mode, |
| 2619 journal); | 2619 journal, NULL); |
| 2620 journal->j_dev_mode = blkdev_mode; 2621 if (IS_ERR(journal->j_dev_bd)) { 2622 result = PTR_ERR(journal->j_dev_bd); 2623 journal->j_dev_bd = NULL; 2624 reiserfs_warning(super, "sh-458", 2625 "cannot init journal device unknown-block(%u,%u): %i", 2626 MAJOR(jdev), MINOR(jdev), result); 2627 return result; 2628 } else if (jdev != super->s_dev) 2629 set_blocksize(journal->j_dev_bd, super->s_blocksize); 2630 2631 return 0; 2632 } 2633 2634 journal->j_dev_mode = blkdev_mode; | 2620 journal->j_dev_mode = blkdev_mode; 2621 if (IS_ERR(journal->j_dev_bd)) { 2622 result = PTR_ERR(journal->j_dev_bd); 2623 journal->j_dev_bd = NULL; 2624 reiserfs_warning(super, "sh-458", 2625 "cannot init journal device unknown-block(%u,%u): %i", 2626 MAJOR(jdev), MINOR(jdev), result); 2627 return result; 2628 } else if (jdev != super->s_dev) 2629 set_blocksize(journal->j_dev_bd, super->s_blocksize); 2630 2631 return 0; 2632 } 2633 2634 journal->j_dev_mode = blkdev_mode; |
| 2635 journal->j_dev_bd = blkdev_get_by_path(jdev_name, blkdev_mode, journal); | 2635 journal->j_dev_bd = blkdev_get_by_path(jdev_name, blkdev_mode, journal, 2636 NULL); |
| 2636 if (IS_ERR(journal->j_dev_bd)) { 2637 result = PTR_ERR(journal->j_dev_bd); 2638 journal->j_dev_bd = NULL; 2639 reiserfs_warning(super, "sh-457", 2640 "journal_init_dev: Cannot open '%s': %i", 2641 jdev_name, result); 2642 return result; 2643 } --- 1761 unchanged lines hidden --- | 2637 if (IS_ERR(journal->j_dev_bd)) { 2638 result = PTR_ERR(journal->j_dev_bd); 2639 journal->j_dev_bd = NULL; 2640 reiserfs_warning(super, "sh-457", 2641 "journal_init_dev: Cannot open '%s': %i", 2642 jdev_name, result); 2643 return result; 2644 } --- 1761 unchanged lines hidden --- |