diff options
author | Andrew Morton | 2008-02-08 13:21:49 +0100 |
---|---|---|
committer | Linus Torvalds | 2008-02-08 18:22:41 +0100 |
commit | b76db735407a26c1036fdfef249ddc35eb969bc4 (patch) | |
tree | 02a9eb85b34765bc1eb82d632b1913ce79b8a6d6 | |
parent | mount options: fix tmpfs (diff) | |
download | kernel-qcow2-linux-b76db735407a26c1036fdfef249ddc35eb969bc4.tar.gz kernel-qcow2-linux-b76db735407a26c1036fdfef249ddc35eb969bc4.tar.xz kernel-qcow2-linux-b76db735407a26c1036fdfef249ddc35eb969bc4.zip |
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.c | 2 |
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 { 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); |