Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 400ade845cb9930552e791bbd658a0953f68499d

Authored by Jiro SEKIBA
Committed by Ryusuke Konishi
1 parent 25294d8c37
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

nilfs2: enlarge s_volume_name member in nilfs_super_block 

Current s_volume_name has 16 bytes, which is too small as modern filesystem.

s_last_mounted resides just after s_volume_name and has 64 bytes.

s_last_mounted is historically came from ext2, but not used in nilfs2 at all.
Deleting s_last_mounted member and merging that space with s_volume_name
enlarge s_volume_name upto 80 bytes for volume label.

When user land tools see the old header for new disk, it will just ignore
additional bytes stored in s_last_mounted.  While, old disk format has only
16 bytes label, it doesn't affects in case seeing the new header for old disk.

Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

include/linux/nilfs2_fs.h
Diff comments   View file @ 400ade8
... ... @@ -207,8 +207,7 @@
207 207 __le16 s_segment_usage_size; /* Size of a segment usage */
208 208  
209 209 __u8 s_uuid[16]; /* 128-bit uuid for volume */
210   - char s_volume_name[16]; /* volume name */
211   - char s_last_mounted[64]; /* directory where last mounted */
  210 + char s_volume_name[80]; /* volume name */
212 211  
213 212 __le32 s_c_interval; /* Commit interval of segment */
214 213 __le32 s_c_block_max; /* Threshold of data amount for