diff options
Diffstat (limited to 'fs/reiserfs/super.c')
-rw-r--r-- | fs/reiserfs/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 4d13cfff24e0..fa651790b907 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -136,7 +136,7 @@ static int reiserfs_freeze(struct super_block *s) | |||
136 | } else { | 136 | } else { |
137 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), | 137 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), |
138 | 1); | 138 | 1); |
139 | journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); | 139 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s)); |
140 | reiserfs_block_writes(&th); | 140 | reiserfs_block_writes(&th); |
141 | journal_end_sync(&th); | 141 | journal_end_sync(&th); |
142 | } | 142 | } |
@@ -551,7 +551,7 @@ static void reiserfs_put_super(struct super_block *s) | |||
551 | 1); | 551 | 1); |
552 | set_sb_umount_state(SB_DISK_SUPER_BLOCK(s), | 552 | set_sb_umount_state(SB_DISK_SUPER_BLOCK(s), |
553 | REISERFS_SB(s)->s_mount_state); | 553 | REISERFS_SB(s)->s_mount_state); |
554 | journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); | 554 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s)); |
555 | } | 555 | } |
556 | } | 556 | } |
557 | 557 | ||
@@ -1477,7 +1477,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
1477 | /* Mounting a rw partition read-only. */ | 1477 | /* Mounting a rw partition read-only. */ |
1478 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1); | 1478 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1); |
1479 | set_sb_umount_state(rs, REISERFS_SB(s)->s_mount_state); | 1479 | set_sb_umount_state(rs, REISERFS_SB(s)->s_mount_state); |
1480 | journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); | 1480 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s)); |
1481 | } else { | 1481 | } else { |
1482 | /* remount read-write */ | 1482 | /* remount read-write */ |
1483 | if (!(s->s_flags & MS_RDONLY)) { | 1483 | if (!(s->s_flags & MS_RDONLY)) { |
@@ -1509,7 +1509,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
1509 | if (!old_format_only(s)) | 1509 | if (!old_format_only(s)) |
1510 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); | 1510 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); |
1511 | /* mark_buffer_dirty (SB_BUFFER_WITH_SB (s), 1); */ | 1511 | /* mark_buffer_dirty (SB_BUFFER_WITH_SB (s), 1); */ |
1512 | journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); | 1512 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s)); |
1513 | REISERFS_SB(s)->s_mount_state = REISERFS_VALID_FS; | 1513 | REISERFS_SB(s)->s_mount_state = REISERFS_VALID_FS; |
1514 | } | 1514 | } |
1515 | /* this will force a full flush of all journal lists */ | 1515 | /* this will force a full flush of all journal lists */ |
@@ -2106,7 +2106,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
2106 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); | 2106 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); |
2107 | 2107 | ||
2108 | 2108 | ||
2109 | journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s)); | 2109 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s)); |
2110 | errval = journal_end(&th); | 2110 | errval = journal_end(&th); |
2111 | if (errval) { | 2111 | if (errval) { |
2112 | dput(s->s_root); | 2112 | dput(s->s_root); |
@@ -2481,7 +2481,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
2481 | unlock_buffer(bh); | 2481 | unlock_buffer(bh); |
2482 | reiserfs_write_lock(sb); | 2482 | reiserfs_write_lock(sb); |
2483 | reiserfs_prepare_for_journal(sb, bh, 1); | 2483 | reiserfs_prepare_for_journal(sb, bh, 1); |
2484 | journal_mark_dirty(current->journal_info, sb, bh); | 2484 | journal_mark_dirty(current->journal_info, bh); |
2485 | if (!journal_quota) | 2485 | if (!journal_quota) |
2486 | reiserfs_add_ordered_list(inode, bh); | 2486 | reiserfs_add_ordered_list(inode, bh); |
2487 | reiserfs_write_unlock(sb); | 2487 | reiserfs_write_unlock(sb); |