Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / node.h

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index d10b6448a671fc961a5c8fc121dee4a02d0cd37a..f405bbf2435a50d8608ff901f9eadc76b0b5f6a9 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -25,10 +25,19 @@
 
 /* vector size for gang look-up from nat cache that consists of radix tree */
 #define NATVEC_SIZE    64
+#define SETVEC_SIZE    32
 
 /* return value for read_node_page */
 #define LOCKED_PAGE    1
 
+/* For flag in struct node_info */
+enum {
+       IS_CHECKPOINTED,        /* is it checkpointed before? */
+       HAS_FSYNCED_INODE,      /* is the inode fsynced before? */
+       HAS_LAST_FSYNC,         /* has the latest node fsync mark? */
+       IS_DIRTY,               /* this nat entry is dirty? */
+};
+
 /*
  * For node information
  */
@@ -37,18 +46,11 @@ struct node_info {
        nid_t ino;              /* inode number of the node's owner */
        block_t blk_addr;       /* block address of the node */
        unsigned char version;  /* version of the node */
-};
-
-enum {
-       IS_CHECKPOINTED,        /* is it checkpointed before? */
-       HAS_FSYNCED_INODE,      /* is the inode fsynced before? */
-       HAS_LAST_FSYNC,         /* has the latest node fsync mark? */
-       IS_DIRTY,               /* this nat entry is dirty? */
+       unsigned char flag;     /* for node information bits */
 };
 
 struct nat_entry {
        struct list_head list;  /* for clean or dirty nat list */
-       unsigned char flag;     /* for node information bits */
        struct node_info ni;    /* in-memory node information */
 };
 
@@ -63,20 +65,30 @@ struct nat_entry {
 
 #define inc_node_version(version)      (++version)
 
+static inline void copy_node_info(struct node_info *dst,
+                                               struct node_info *src)
+{
+       dst->nid = src->nid;
+       dst->ino = src->ino;
+       dst->blk_addr = src->blk_addr;
+       dst->version = src->version;
+       /* should not copy flag here */
+}
+
 static inline void set_nat_flag(struct nat_entry *ne,
                                unsigned int type, bool set)
 {
        unsigned char mask = 0x01 << type;
        if (set)
-               ne->flag |= mask;
+               ne->ni.flag |= mask;
        else
-               ne->flag &= ~mask;
+               ne->ni.flag &= ~mask;
 }
 
 static inline bool get_nat_flag(struct nat_entry *ne, unsigned int type)
 {
        unsigned char mask = 0x01 << type;
-       return ne->flag & mask;
+       return ne->ni.flag & mask;
 }
 
 static inline void nat_reset_flag(struct nat_entry *ne)
@@ -108,6 +120,7 @@ enum mem_type {
        NAT_ENTRIES,    /* indicates the cached nat entry */
        DIRTY_DENTS,    /* indicates dirty dentry pages */
        INO_ENTRIES,    /* indicates inode entries */
+       BASE_CHECK,     /* check kernel status */
 };
 
 struct nat_entry_set {
@@ -200,11 +213,19 @@ static inline void fill_node_footer(struct page *page, nid_t nid,
                                nid_t ino, unsigned int ofs, bool reset)
 {
        struct f2fs_node *rn = F2FS_NODE(page);
+       unsigned int old_flag = 0;
+
        if (reset)
                memset(rn, 0, sizeof(*rn));
+       else
+               old_flag = le32_to_cpu(rn->footer.flag);
+
        rn->footer.nid = cpu_to_le32(nid);
        rn->footer.ino = cpu_to_le32(ino);
-       rn->footer.flag = cpu_to_le32(ofs << OFFSET_BIT_SHIFT);
+
+       /* should remain old flag bits such as COLD_BIT_SHIFT */
+       rn->footer.flag = cpu_to_le32((ofs << OFFSET_BIT_SHIFT) |
+                                       (old_flag & OFFSET_BIT_MASK));
 }
 
 static inline void copy_node_footer(struct page *dst, struct page *src)