Merge branch 'clk-ti' into clk-next

[linux.git] / include / linux / f2fs_fs.h

diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index d7711048ef93b81827f2d593c08afeb5611fc6f0..f5740423b0023e9abf5c5023a5f146a5da59012a 100644 (file)
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -116,6 +116,7 @@ struct f2fs_super_block {
 /*
  * For checkpoint
  */
+#define CP_DISABLED_QUICK_FLAG         0x00002000
 #define CP_DISABLED_FLAG               0x00001000
 #define CP_QUOTA_NEED_FSCK_FLAG                0x00000800
 #define CP_LARGE_NAT_BITMAP_FLAG       0x00000400
@@ -186,7 +187,7 @@ struct f2fs_orphan_block {
 struct f2fs_extent {
        __le32 fofs;            /* start file offset of the extent */
        __le32 blk;             /* start block address of the extent */
-       __le32 len;             /* lengh of the extent */
+       __le32 len;             /* length of the extent */
 } __packed;
 
 #define F2FS_NAME_LEN          255
@@ -284,7 +285,7 @@ enum {
 
 struct node_footer {
        __le32 nid;             /* node id */
-       __le32 ino;             /* inode nunmber */
+       __le32 ino;             /* inode number */
        __le32 flag;            /* include cold/fsync/dentry marks and offset */
        __le64 cp_ver;          /* checkpoint version */
        __le32 next_blkaddr;    /* next node page block address */
@@ -489,12 +490,12 @@ typedef __le32    f2fs_hash_t;
 
 /*
  * space utilization of regular dentry and inline dentry (w/o extra reservation)
- *             regular dentry                  inline dentry
- * bitmap      1 * 27 = 27                     1 * 23 = 23
- * reserved    1 * 3 = 3                       1 * 7 = 7
- * dentry      11 * 214 = 2354                 11 * 182 = 2002
- * filename    8 * 214 = 1712                  8 * 182 = 1456
- * total       4096                            3488
+ *             regular dentry          inline dentry (def)     inline dentry (min)
+ * bitmap      1 * 27 = 27             1 * 23 = 23             1 * 1 = 1
+ * reserved    1 * 3 = 3               1 * 7 = 7               1 * 1 = 1
+ * dentry      11 * 214 = 2354         11 * 182 = 2002         11 * 2 = 22
+ * filename    8 * 214 = 1712          8 * 182 = 1456          8 * 2 = 16
+ * total       4096                    3488                    40
  *
  * Note: there are more reserved space in inline dentry than in regular
  * dentry, when converting inline dentry we should handle this carefully.
@@ -506,12 +507,13 @@ typedef __le32    f2fs_hash_t;
 #define SIZE_OF_RESERVED       (PAGE_SIZE - ((SIZE_OF_DIR_ENTRY + \
                                F2FS_SLOT_LEN) * \
                                NR_DENTRY_IN_BLOCK + SIZE_OF_DENTRY_BITMAP))
+#define MIN_INLINE_DENTRY_SIZE         40      /* just include '.' and '..' entries */
 
 /* One directory entry slot representing F2FS_SLOT_LEN-sized file name */
 struct f2fs_dir_entry {
        __le32 hash_code;       /* hash code of file name */
        __le32 ino;             /* inode number */
-       __le16 name_len;        /* lengh of file name */
+       __le16 name_len;        /* length of file name */
        __u8 file_type;         /* file type */
 } __packed;