diff options
author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-01-17 15:27:56 -0500 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-01-17 16:24:30 -0500 |
commit | 18d1d7fbcc260e67d249bf90b454d8cf34288453 (patch) | |
tree | 160479d5a455ea2ac111ecbbf0e48f6a5dfcf0ea /fs/ubifs/ubifs.h | |
parent | d8cdda3efb9331bedbcca2343591eab2316f4cae (diff) |
UBIFS: introduce mounting flag
This is a preparational patch which removes the 'c->always_chk_crc' which was
set during mounting and remounting to R/W mode and introduces 'c->mounting'
flag which is set when mounting. Now the 'c->always_chk_crc' flag is the
same as 'c->remounting_rw && c->mounting'.
This patch is a preparation for the next one which will need to know when we
are mounting and remounting to R/W mode, which is exactly what
'c->always_chk_crc' effectively is, but its name does not suite the
next patch. The other possibility would be to just re-name it, but then
we'd end up with less logical flags coverage.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/ubifs.h')
-rw-r--r-- | fs/ubifs/ubifs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index d1efa37d80ae..d1823541f987 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -1169,9 +1169,8 @@ struct ubifs_debug_info; | |||
1169 | * @empty: %1 if the UBI device is empty | 1169 | * @empty: %1 if the UBI device is empty |
1170 | * @need_recovery: %1 if the file-system needs recovery | 1170 | * @need_recovery: %1 if the file-system needs recovery |
1171 | * @replaying: %1 during journal replay | 1171 | * @replaying: %1 during journal replay |
1172 | * @mounting: %1 while mounting | ||
1172 | * @remounting_rw: %1 while re-mounting from R/O mode to R/W mode | 1173 | * @remounting_rw: %1 while re-mounting from R/O mode to R/W mode |
1173 | * @always_chk_crc: always check CRCs (while mounting and remounting to R/W | ||
1174 | * mode) | ||
1175 | * @replay_tree: temporary tree used during journal replay | 1174 | * @replay_tree: temporary tree used during journal replay |
1176 | * @replay_list: temporary list used during journal replay | 1175 | * @replay_list: temporary list used during journal replay |
1177 | * @replay_buds: list of buds to replay | 1176 | * @replay_buds: list of buds to replay |
@@ -1405,8 +1404,8 @@ struct ubifs_info { | |||
1405 | unsigned int empty:1; | 1404 | unsigned int empty:1; |
1406 | unsigned int need_recovery:1; | 1405 | unsigned int need_recovery:1; |
1407 | unsigned int replaying:1; | 1406 | unsigned int replaying:1; |
1407 | unsigned int mounting:1; | ||
1408 | unsigned int remounting_rw:1; | 1408 | unsigned int remounting_rw:1; |
1409 | unsigned int always_chk_crc:1; | ||
1410 | struct rb_root replay_tree; | 1409 | struct rb_root replay_tree; |
1411 | struct list_head replay_list; | 1410 | struct list_head replay_list; |
1412 | struct list_head replay_buds; | 1411 | struct list_head replay_buds; |