The patch titled Define the shmem_inode_info flags directly has been added to the -mm tree. Its filename is define-the-shmem_inode_info-flags-directly.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Define the shmem_inode_info flags directly From: Adam Litke <agl@xxxxxxxxxx> Defining flags in terms of other flags is always confusing. Give them literal values instead of defining them in terms of VM_flags. While we're at it, move them to a header file in preparation for the introduction of a SHMEM_HUGETLB flag. Signed-off-by: Adam Litke <agl@xxxxxxxxxx> Cc: Hugh Dickins <hugh@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/shmem_fs.h | 4 ++++ mm/shmem.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN include/linux/shmem_fs.h~define-the-shmem_inode_info-flags-directly include/linux/shmem_fs.h --- a/include/linux/shmem_fs.h~define-the-shmem_inode_info-flags-directly +++ a/include/linux/shmem_fs.h @@ -8,6 +8,10 @@ #define SHMEM_NR_DIRECT 16 +/* These info->flags are used to handle pagein/truncate races efficiently */ +#define SHMEM_PAGEIN 0x00000001 +#define SHMEM_TRUNCATE 0x00000002 + struct shmem_inode_info { spinlock_t lock; unsigned long flags; diff -puN mm/shmem.c~define-the-shmem_inode_info-flags-directly mm/shmem.c --- a/mm/shmem.c~define-the-shmem_inode_info-flags-directly +++ a/mm/shmem.c @@ -66,10 +66,6 @@ #define VM_ACCT(size) (PAGE_CACHE_ALIGN(size) >> PAGE_SHIFT) -/* info->flags needs VM_flags to handle pagein/truncate races efficiently */ -#define SHMEM_PAGEIN VM_READ -#define SHMEM_TRUNCATE VM_WRITE - /* Definition to limit shmem_truncate's steps between cond_rescheds */ #define LATENCY_LIMIT 64 _ Patches currently in -mm which might be from agl@xxxxxxxxxx are hugetlb-preserve-hugetlb-pte-dirty-state.patch define-the-shmem_inode_info-flags-directly.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html