diff options
Diffstat (limited to 'fs/reiserfs/super.c')
| -rw-r--r-- | fs/reiserfs/super.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 5464ec517702..020c9cacbb2f 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -121,7 +121,7 @@ void reiserfs_schedule_old_flush(struct super_block *s) | |||
| 121 | * Avoid scheduling flush when sb is being shut down. It can race | 121 | * Avoid scheduling flush when sb is being shut down. It can race |
| 122 | * with journal shutdown and free still queued delayed work. | 122 | * with journal shutdown and free still queued delayed work. |
| 123 | */ | 123 | */ |
| 124 | if (sb_rdonly(s) || !(s->s_flags & MS_ACTIVE)) | 124 | if (sb_rdonly(s) || !(s->s_flags & SB_ACTIVE)) |
| 125 | return; | 125 | return; |
| 126 | 126 | ||
| 127 | spin_lock(&sbi->old_work_lock); | 127 | spin_lock(&sbi->old_work_lock); |
| @@ -252,11 +252,11 @@ static int finish_unfinished(struct super_block *s) | |||
| 252 | 252 | ||
| 253 | #ifdef CONFIG_QUOTA | 253 | #ifdef CONFIG_QUOTA |
| 254 | /* Needed for iput() to work correctly and not trash data */ | 254 | /* Needed for iput() to work correctly and not trash data */ |
| 255 | if (s->s_flags & MS_ACTIVE) { | 255 | if (s->s_flags & SB_ACTIVE) { |
| 256 | ms_active_set = 0; | 256 | ms_active_set = 0; |
| 257 | } else { | 257 | } else { |
| 258 | ms_active_set = 1; | 258 | ms_active_set = 1; |
| 259 | s->s_flags |= MS_ACTIVE; | 259 | s->s_flags |= SB_ACTIVE; |
| 260 | } | 260 | } |
| 261 | /* Turn on quotas so that they are updated correctly */ | 261 | /* Turn on quotas so that they are updated correctly */ |
| 262 | for (i = 0; i < REISERFS_MAXQUOTAS; i++) { | 262 | for (i = 0; i < REISERFS_MAXQUOTAS; i++) { |
| @@ -411,7 +411,7 @@ static int finish_unfinished(struct super_block *s) | |||
| 411 | reiserfs_write_lock(s); | 411 | reiserfs_write_lock(s); |
| 412 | if (ms_active_set) | 412 | if (ms_active_set) |
| 413 | /* Restore the flag back */ | 413 | /* Restore the flag back */ |
| 414 | s->s_flags &= ~MS_ACTIVE; | 414 | s->s_flags &= ~SB_ACTIVE; |
| 415 | #endif | 415 | #endif |
| 416 | pathrelse(&path); | 416 | pathrelse(&path); |
| 417 | if (done) | 417 | if (done) |
| @@ -1521,7 +1521,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
| 1521 | goto out_err_unlock; | 1521 | goto out_err_unlock; |
| 1522 | } | 1522 | } |
| 1523 | 1523 | ||
| 1524 | if (*mount_flags & MS_RDONLY) { | 1524 | if (*mount_flags & SB_RDONLY) { |
| 1525 | reiserfs_write_unlock(s); | 1525 | reiserfs_write_unlock(s); |
| 1526 | reiserfs_xattr_init(s, *mount_flags); | 1526 | reiserfs_xattr_init(s, *mount_flags); |
| 1527 | /* remount read-only */ | 1527 | /* remount read-only */ |
| @@ -1567,7 +1567,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
| 1567 | REISERFS_SB(s)->s_mount_state = sb_umount_state(rs); | 1567 | REISERFS_SB(s)->s_mount_state = sb_umount_state(rs); |
| 1568 | 1568 | ||
| 1569 | /* now it is safe to call journal_begin */ | 1569 | /* now it is safe to call journal_begin */ |
| 1570 | s->s_flags &= ~MS_RDONLY; | 1570 | s->s_flags &= ~SB_RDONLY; |
| 1571 | err = journal_begin(&th, s, 10); | 1571 | err = journal_begin(&th, s, 10); |
| 1572 | if (err) | 1572 | if (err) |
| 1573 | goto out_err_unlock; | 1573 | goto out_err_unlock; |
| @@ -1575,7 +1575,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
| 1575 | /* Mount a partition which is read-only, read-write */ | 1575 | /* Mount a partition which is read-only, read-write */ |
| 1576 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1); | 1576 | reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1); |
| 1577 | REISERFS_SB(s)->s_mount_state = sb_umount_state(rs); | 1577 | REISERFS_SB(s)->s_mount_state = sb_umount_state(rs); |
| 1578 | s->s_flags &= ~MS_RDONLY; | 1578 | s->s_flags &= ~SB_RDONLY; |
| 1579 | set_sb_umount_state(rs, REISERFS_ERROR_FS); | 1579 | set_sb_umount_state(rs, REISERFS_ERROR_FS); |
| 1580 | if (!old_format_only(s)) | 1580 | if (!old_format_only(s)) |
| 1581 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); | 1581 | set_sb_mnt_count(rs, sb_mnt_count(rs) + 1); |
| @@ -1590,7 +1590,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) | |||
| 1590 | goto out_err_unlock; | 1590 | goto out_err_unlock; |
| 1591 | 1591 | ||
| 1592 | reiserfs_write_unlock(s); | 1592 | reiserfs_write_unlock(s); |
| 1593 | if (!(*mount_flags & MS_RDONLY)) { | 1593 | if (!(*mount_flags & SB_RDONLY)) { |
| 1594 | dquot_resume(s, -1); | 1594 | dquot_resume(s, -1); |
| 1595 | reiserfs_write_lock(s); | 1595 | reiserfs_write_lock(s); |
| 1596 | finish_unfinished(s); | 1596 | finish_unfinished(s); |
| @@ -2055,7 +2055,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
| 2055 | if (bdev_read_only(s->s_bdev) && !sb_rdonly(s)) { | 2055 | if (bdev_read_only(s->s_bdev) && !sb_rdonly(s)) { |
| 2056 | SWARN(silent, s, "clm-7000", | 2056 | SWARN(silent, s, "clm-7000", |
| 2057 | "Detected readonly device, marking FS readonly"); | 2057 | "Detected readonly device, marking FS readonly"); |
| 2058 | s->s_flags |= MS_RDONLY; | 2058 | s->s_flags |= SB_RDONLY; |
| 2059 | } | 2059 | } |
| 2060 | args.objectid = REISERFS_ROOT_OBJECTID; | 2060 | args.objectid = REISERFS_ROOT_OBJECTID; |
| 2061 | args.dirid = REISERFS_ROOT_PARENT_OBJECTID; | 2061 | args.dirid = REISERFS_ROOT_PARENT_OBJECTID; |
