Merge tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / nilfs2 / segment.h

diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h
index 0408b9b..6565c10 100644 (file)
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
@@ -13,11 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Written by Ryusuke Konishi <ryusuke@osrg.net>
+ * Written by Ryusuke Konishi.
  *
  */
 #ifndef _NILFS_SEGMENT_H
@@ -75,7 +71,7 @@ struct nilfs_recovery_info {
  */
 struct nilfs_cstage {
        int                     scnt;
-       unsigned                flags;
+       unsigned int            flags;
        struct nilfs_inode_info *dirty_file_ptr;
        struct nilfs_inode_info *gc_inode_ptr;
 };
@@ -84,7 +80,7 @@ struct nilfs_segment_buffer;
 
 struct nilfs_segsum_pointer {
        struct buffer_head     *bh;
-       unsigned                offset; /* offset in bytes */
+       unsigned int            offset; /* offset in bytes */
 };
 
 /**
@@ -193,11 +189,15 @@ enum {
        NILFS_SC_DIRTY,         /* One or more dirty meta-data blocks exist */
        NILFS_SC_UNCLOSED,      /* Logical segment is not closed */
        NILFS_SC_SUPER_ROOT,    /* The latest segment has a super root */
-       NILFS_SC_PRIOR_FLUSH,   /* Requesting immediate flush without making a
-                                  checkpoint */
-       NILFS_SC_HAVE_DELTA,    /* Next checkpoint will have update of files
-                                  other than DAT, cpfile, sufile, or files
-                                  moved by GC */
+       NILFS_SC_PRIOR_FLUSH,   /*
+                                * Requesting immediate flush without making a
+                                * checkpoint
+                                */
+       NILFS_SC_HAVE_DELTA,    /*
+                                * Next checkpoint will have update of files
+                                * other than DAT, cpfile, sufile, or files
+                                * moved by GC.
+                                */
 };
 
 /* sc_state */
@@ -207,17 +207,23 @@ enum {
 /*
  * Constant parameters
  */
-#define NILFS_SC_CLEANUP_RETRY     3  /* Retry count of construction when
-                                         destroying segctord */
+#define NILFS_SC_CLEANUP_RETRY     3  /*
+                                       * Retry count of construction when
+                                       * destroying segctord
+                                       */
 
 /*
  * Default values of timeout, in seconds.
  */
-#define NILFS_SC_DEFAULT_TIMEOUT    5   /* Timeout value of dirty blocks.
-                                          It triggers construction of a
-                                          logical segment with a super root */
-#define NILFS_SC_DEFAULT_SR_FREQ    30  /* Maximum frequency of super root
-                                          creation */
+#define NILFS_SC_DEFAULT_TIMEOUT    5   /*
+                                        * Timeout value of dirty blocks.
+                                        * It triggers construction of a
+                                        * logical segment with a super root.
+                                        */
+#define NILFS_SC_DEFAULT_SR_FREQ    30  /*
+                                        * Maximum frequency of super root
+                                        * creation
+                                        */
 
 /*
  * The default threshold amount of data, in block counts.