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

[safe/jmp/linux-2.6] / include / linux / shmem_fs.h

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index d7699a6..fd83f25 100644 (file)
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -34,9 +34,7 @@ struct shmem_sb_info {
        uid_t uid;                  /* Mount uid for root directory */
        gid_t gid;                  /* Mount gid for root directory */
        mode_t mode;                /* Mount mode for root directory */
-       unsigned short policy;      /* Default NUMA memory alloc policy */
-       unsigned short flags;       /* Optional mempolicy flags */
-       nodemask_t policy_nodes;    /* nodemask for preferred and bind */
+       struct mempolicy *mpol;     /* default memory policy for mappings */
 };
 
 static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
@@ -45,7 +43,7 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
 }
 
 #ifdef CONFIG_TMPFS_POSIX_ACL
-int shmem_permission(struct inode *, int, struct nameidata *);
+int shmem_permission(struct inode *, int);
 int shmem_acl_init(struct inode *, struct inode *);
 void shmem_acl_destroy_inode(struct inode *);