diff options
author | Jan Kara <jack@suse.cz> | 2011-12-21 14:17:10 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-06 23:20:13 -0500 |
commit | c3aa077648e147783a7a53b409578234647db853 (patch) | |
tree | 6ad21f0a005080a1a89bcd736454bc32f0cffab4 /include | |
parent | 8e8b87964bc8dc5c14b6543fc933b7725f07d3ac (diff) |
reiserfs: Properly display mount options in /proc/mounts
Make reiserfs properly display mount options in /proc/mounts.
CC: reiserfs-devel@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/reiserfs_fs.h | 7 | ||||
-rw-r--r-- | include/linux/reiserfs_fs_sb.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 26be28fd7b76..2213ddcce20c 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
@@ -1759,13 +1759,14 @@ struct reiserfs_journal_header { | |||
1759 | REISERFS_QUOTA_TRANS_BLOCKS(sb))) | 1759 | REISERFS_QUOTA_TRANS_BLOCKS(sb))) |
1760 | 1760 | ||
1761 | #ifdef CONFIG_QUOTA | 1761 | #ifdef CONFIG_QUOTA |
1762 | #define REISERFS_QUOTA_OPTS ((1 << REISERFS_USRQUOTA) | (1 << REISERFS_GRPQUOTA)) | ||
1762 | /* We need to update data and inode (atime) */ | 1763 | /* We need to update data and inode (atime) */ |
1763 | #define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? 2 : 0) | 1764 | #define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? 2 : 0) |
1764 | /* 1 balancing, 1 bitmap, 1 data per write + stat data update */ | 1765 | /* 1 balancing, 1 bitmap, 1 data per write + stat data update */ |
1765 | #define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \ | 1766 | #define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? \ |
1766 | (DQUOT_INIT_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_INIT_REWRITE+1) : 0) | 1767 | (DQUOT_INIT_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_INIT_REWRITE+1) : 0) |
1767 | /* same as with INIT */ | 1768 | /* same as with INIT */ |
1768 | #define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \ | 1769 | #define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? \ |
1769 | (DQUOT_DEL_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_DEL_REWRITE+1) : 0) | 1770 | (DQUOT_DEL_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_DEL_REWRITE+1) : 0) |
1770 | #else | 1771 | #else |
1771 | #define REISERFS_QUOTA_TRANS_BLOCKS(s) 0 | 1772 | #define REISERFS_QUOTA_TRANS_BLOCKS(s) 0 |
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 52c83b6a758a..8c9e85c64b46 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h | |||
@@ -417,6 +417,7 @@ struct reiserfs_sb_info { | |||
417 | char *s_qf_names[MAXQUOTAS]; | 417 | char *s_qf_names[MAXQUOTAS]; |
418 | int s_jquota_fmt; | 418 | int s_jquota_fmt; |
419 | #endif | 419 | #endif |
420 | char *s_jdev; /* Stored jdev for mount option showing */ | ||
420 | #ifdef CONFIG_REISERFS_CHECK | 421 | #ifdef CONFIG_REISERFS_CHECK |
421 | 422 | ||
422 | struct tree_balance *cur_tb; /* | 423 | struct tree_balance *cur_tb; /* |
@@ -482,7 +483,8 @@ enum reiserfs_mount_options { | |||
482 | REISERFS_ERROR_RO, | 483 | REISERFS_ERROR_RO, |
483 | REISERFS_ERROR_CONTINUE, | 484 | REISERFS_ERROR_CONTINUE, |
484 | 485 | ||
485 | REISERFS_QUOTA, /* Some quota option specified */ | 486 | REISERFS_USRQUOTA, /* User quota option specified */ |
487 | REISERFS_GRPQUOTA, /* Group quota option specified */ | ||
486 | 488 | ||
487 | REISERFS_TEST1, | 489 | REISERFS_TEST1, |
488 | REISERFS_TEST2, | 490 | REISERFS_TEST2, |