 @@ -1,14 +1,14 @@
-/* $NetBSD: nilfs_fs.h,v 1.1 2009/07/18 16:31:42 reinoud Exp $ */
+/* $NetBSD: nilfs_fs.h,v 1.2 2010/06/24 10:20:08 reinoud Exp $ */
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -266,28 +266,27 @@ struct nilfs_super_block {
          uint32_t s_checkinterval;         /* max. time between checks       */
          uint32_t s_creator_os;            /* OS that created it             */
          uint16_t s_def_resuid;            /* default uid for reserv. blocks */
          uint16_t s_def_resgid;            /* default gid for reserv. blocks */
          uint32_t s_first_ino;             /* first non-reserved inode       */
          uint16_t s_inode_size;            /* size of an inode               */
          uint16_t s_dat_entry_size;        /* size of a dat entry            */
          uint16_t s_checkpoint_size;       /* size of a checkpoint           */
          uint16_t s_segment_usage_size;    /* size of a segment usage        */
          uint8_t  s_uuid[16];              /* 128-bit uuid for volume        */
-         char     s_volume_name[16];       /* volume name                    */
+         char     s_volume_name[80];       /* volume name                    */
          char     s_last_mounted[64];      /* directory where last mounted   */
          uint32_t s_c_interval;            /* commit interval of segment     */
          uint32_t s_c_block_max;           /* threshold of data amount for
                                               the segment construction */
          uint32_t s_reserved[192];         /* padding to end of the block    */
 };
 #define NILFS_SUPER_MAGIC        0x3434    /* NILFS filesystem  magic number */
 #define NILFS_SB_OFFSET_BYTES    1024      /* byte offset of nilfs superblock */
 #define NILFS_SB2_OFFSET_BYTES(devsize)	((((devsize) >> 12) - 1) << 12)
 /* codes for operating systems in superblock */
 @@ -413,26 +412,27 @@ union nilfs_binfo {
 struct nilfs_segment_summary {
          uint32_t ss_datasum;		/* CRC of complete data block        */
          uint32_t ss_sumsum;		/* CRC of segment summary only       */
          uint32_t ss_magic;		/* magic to identify segment summary */
          uint16_t ss_bytes;		/* size of segment summary structure */
          uint16_t ss_flags;		/* NILFS_SS_* flags                  */
          uint64_t ss_seq;		/* sequence number of this segm. sum */
          uint64_t ss_create;		/* creation timestamp in seconds     */
          uint64_t ss_next;		/* blocknumber of next segment       */
          uint32_t ss_nblocks;		/* number of blocks follow           */
          uint32_t ss_nfinfo;		/* number of finfo structures follow */
          uint32_t ss_sumbytes;		/* total size of segment summary     */
          uint32_t ss_pad;
 	 uint64_t ss_cno;		/* latest checkpoint number known    */
          /* stream of finfo structures */
 };
 #define NILFS_SEGSUM_MAGIC       0x1eaffa11  /* segment summary magic number */
 /* Segment summary flags */
 #define NILFS_SS_LOGBGN 0x0001  /* begins a logical segment */
 #define NILFS_SS_LOGEND 0x0002  /* ends a logical segment */
 #define NILFS_SS_SR     0x0004  /* has super root */
 #define NILFS_SS_SYNDT  0x0008  /* includes data only updates */
 #define NILFS_SS_GC     0x0010  /* segment written for cleaner operation */
 #define NILFS_SS_FLAG_BITS "\20\1LOGBGN\2LOGEND\3SR\4SYNDT\5GC"