From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 8 Feb 2008 12:21:49 +0000 (-0800)
Subject: mount-options-fix-tmpfs-fix
X-Git-Tag: v2.6.25-rc1~75
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b76db735407a26c1036fdfef249ddc35eb969bc4;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/mm/shmem.c b/mm/shmem.c
index 2f961a6dbf5..90b576cbc06 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -85,6 +85,7 @@ enum sgp_type {
 	SGP_WRITE,	/* may exceed i_size, may allocate page */
 };
 
+#ifdef CONFIG_TMPFS
 static unsigned long shmem_default_max_blocks(void)
 {
 	return totalram_pages / 2;
@@ -94,6 +95,7 @@ static unsigned long shmem_default_max_inodes(void)
 {
 	return min(totalram_pages - totalhigh_pages, totalram_pages / 2);
 }
+#endif
 
 static int shmem_getpage(struct inode *inode, unsigned long idx,
 			 struct page **pagep, enum sgp_type sgp, int *type);