diff options
Diffstat (limited to 'include/linux/nilfs2_fs.h')
-rw-r--r-- | include/linux/nilfs2_fs.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h index 640702e97457..8c2c6116e788 100644 --- a/include/linux/nilfs2_fs.h +++ b/include/linux/nilfs2_fs.h | |||
@@ -199,16 +199,15 @@ struct nilfs_super_block { | |||
199 | __le32 s_creator_os; /* OS */ | 199 | __le32 s_creator_os; /* OS */ |
200 | __le16 s_def_resuid; /* Default uid for reserved blocks */ | 200 | __le16 s_def_resuid; /* Default uid for reserved blocks */ |
201 | __le16 s_def_resgid; /* Default gid for reserved blocks */ | 201 | __le16 s_def_resgid; /* Default gid for reserved blocks */ |
202 | __le32 s_first_ino; /* First non-reserved inode */ | 202 | __le32 s_first_ino; /* First non-reserved inode */ |
203 | 203 | ||
204 | __le16 s_inode_size; /* Size of an inode */ | 204 | __le16 s_inode_size; /* Size of an inode */ |
205 | __le16 s_dat_entry_size; /* Size of a dat entry */ | 205 | __le16 s_dat_entry_size; /* Size of a dat entry */ |
206 | __le16 s_checkpoint_size; /* Size of a checkpoint */ | 206 | __le16 s_checkpoint_size; /* Size of a checkpoint */ |
207 | __le16 s_segment_usage_size; /* Size of a segment usage */ | 207 | __le16 s_segment_usage_size; /* Size of a segment usage */ |
208 | 208 | ||
209 | __u8 s_uuid[16]; /* 128-bit uuid for volume */ | 209 | __u8 s_uuid[16]; /* 128-bit uuid for volume */ |
210 | char s_volume_name[16]; /* volume name */ | 210 | char s_volume_name[80]; /* volume name */ |
211 | char s_last_mounted[64]; /* directory where last mounted */ | ||
212 | 211 | ||
213 | __le32 s_c_interval; /* Commit interval of segment */ | 212 | __le32 s_c_interval; /* Commit interval of segment */ |
214 | __le32 s_c_block_max; /* Threshold of data amount for | 213 | __le32 s_c_block_max; /* Threshold of data amount for |
@@ -377,6 +376,7 @@ union nilfs_binfo { | |||
377 | * @ss_nfinfo: number of finfo structures | 376 | * @ss_nfinfo: number of finfo structures |
378 | * @ss_sumbytes: total size of segment summary in bytes | 377 | * @ss_sumbytes: total size of segment summary in bytes |
379 | * @ss_pad: padding | 378 | * @ss_pad: padding |
379 | * @ss_cno: checkpoint number | ||
380 | */ | 380 | */ |
381 | struct nilfs_segment_summary { | 381 | struct nilfs_segment_summary { |
382 | __le32 ss_datasum; | 382 | __le32 ss_datasum; |
@@ -391,6 +391,7 @@ struct nilfs_segment_summary { | |||
391 | __le32 ss_nfinfo; | 391 | __le32 ss_nfinfo; |
392 | __le32 ss_sumbytes; | 392 | __le32 ss_sumbytes; |
393 | __le32 ss_pad; | 393 | __le32 ss_pad; |
394 | __le64 ss_cno; | ||
394 | /* array of finfo structures */ | 395 | /* array of finfo structures */ |
395 | }; | 396 | }; |
396 | 397 | ||
@@ -437,10 +438,10 @@ struct nilfs_palloc_group_desc { | |||
437 | 438 | ||
438 | /** | 439 | /** |
439 | * struct nilfs_dat_entry - disk address translation entry | 440 | * struct nilfs_dat_entry - disk address translation entry |
440 | * @dt_blocknr: block number | 441 | * @de_blocknr: block number |
441 | * @dt_start: start checkpoint number | 442 | * @de_start: start checkpoint number |
442 | * @dt_end: end checkpoint number | 443 | * @de_end: end checkpoint number |
443 | * @dt_rsv: reserved for future use | 444 | * @de_rsv: reserved for future use |
444 | */ | 445 | */ |
445 | struct nilfs_dat_entry { | 446 | struct nilfs_dat_entry { |
446 | __le64 de_blocknr; | 447 | __le64 de_blocknr; |