aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-08 07:21:49 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:41 -0500
commitb76db735407a26c1036fdfef249ddc35eb969bc4 (patch)
tree02a9eb85b34765bc1eb82d632b1913ce79b8a6d6
parent680d794babebc74484c141448baa9b95b211cf5e (diff)
mount-options-fix-tmpfs-fix
Documentation/SubmitCheckist, please. Cc: Hugh Dickins <hugh@veritas.com> Cc: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 2f961a6dbf57..90b576cbc06e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -85,6 +85,7 @@ enum sgp_type {
85 SGP_WRITE, /* may exceed i_size, may allocate page */ 85 SGP_WRITE, /* may exceed i_size, may allocate page */
86}; 86};
87 87
88#ifdef CONFIG_TMPFS
88static unsigned long shmem_default_max_blocks(void) 89static unsigned long shmem_default_max_blocks(void)
89{ 90{
90 return totalram_pages / 2; 91 return totalram_pages / 2;
@@ -94,6 +95,7 @@ static unsigned long shmem_default_max_inodes(void)
94{ 95{
95 return min(totalram_pages - totalhigh_pages, totalram_pages / 2); 96 return min(totalram_pages - totalhigh_pages, totalram_pages / 2);
96} 97}
98#endif
97 99
98static int shmem_getpage(struct inode *inode, unsigned long idx, 100static int shmem_getpage(struct inode *inode, unsigned long idx,
99 struct page **pagep, enum sgp_type sgp, int *type); 101 struct page **pagep, enum sgp_type sgp, int *type);