Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / shmem_fs.h

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 14a6181..e4b2803 100644 (file)
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -13,14 +13,14 @@
 
 struct shmem_inode_info {
        spinlock_t              lock;
-       unsigned long           next_index;
-       swp_entry_t             i_direct[SHMEM_NR_DIRECT]; /* for the first blocks */
-       struct page            *i_indirect; /* indirect blocks */
-       unsigned long           alloced;    /* data pages allocated to file */
-       unsigned long           swapped;    /* subtotal assigned to swap */
        unsigned long           flags;
-       struct shared_policy     policy;
-       struct list_head        list;
+       unsigned long           alloced;        /* data pages alloced to file */
+       unsigned long           swapped;        /* subtotal assigned to swap */
+       unsigned long           next_index;     /* highest alloced index + 1 */
+       struct shared_policy    policy;         /* NUMA memory alloc policy */
+       struct page             *i_indirect;    /* top indirect blocks page */
+       swp_entry_t             i_direct[SHMEM_NR_DIRECT]; /* first blocks */
+       struct list_head        swaplist;       /* chain of maybes on swap */
        struct inode            vfs_inode;
 };
 
@@ -29,6 +29,8 @@ struct shmem_sb_info {
        unsigned long free_blocks;  /* How many are left for allocation */
        unsigned long max_inodes;   /* How many inodes are allowed */
        unsigned long free_inodes;  /* How many are left for allocation */
+       int policy;                 /* Default NUMA memory alloc policy */
+       nodemask_t policy_nodes;    /* nodemask for preferred and bind */
        spinlock_t    stat_lock;
 };