Skip to contentSkip to conversation

Define the shmem_inode_info flags directly

PATCH In review Adam Litke 2 participants 2 messages Feb 7, 2007

Subsystems (2)
lore
Share & tools
lore

Adam Litke

author
#0 lore raw

PATCH 1/1 Define the shmem_inode_info flags directly

Andrew: This is a pretty basic and obvious cleanup IMO. How about a ride in -mm?

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.

---

 include/linux/shmem_fs.h |    4 ++++
 mm/shmem.c               |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/shmem_fs.h +4 -0
index f3c5189..3ea0b6e 100644
@@ -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;
mm/shmem.c +0 -4
index 70da7a0..a9bdb0d 100644
@@ -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
 
#1 lore raw
Quoted 8 lines · Adam Litke

Andrew: This is a pretty basic and obvious cleanup IMO. How about a ride in -mm?

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.

NAK. Look further and you'll find at least VM_LOCKED and VM_ACCOUNT also used straight in shmem info->flags: it's trying to ensure there won't be a clash when applying VM_flags there. So you've a choice of three ways forward, I don't mind which: (a) leave it alone, (b) add comments, (c) define a separate set of flags for SHMEM and convert where necessary. But NAK to this patch.

(Sorry, I'm way behind and haven't checked your earlier mails yet.)

Hugh

Quoted 28 lines

---

 include/linux/shmem_fs.h |    4 ++++
 mm/shmem.c               |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/shmem_fs.h +4 -0
index f3c5189..3ea0b6e 100644
@@ -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;
mm/shmem.c +0 -0
index 70da7a0..a9bdb0d 100644

mm/shmem.c line 70

Quoted 9 lines
mm/shmem.c +0 -4
@@ -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

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>