Commit b76db735 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

mount-options-fix-tmpfs-fix

Documentation/SubmitCheckist, please.

Cc: Hugh Dickins <hugh@veritas.com>
Cc: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 680d794b
...@@ -85,6 +85,7 @@ enum sgp_type { ...@@ -85,6 +85,7 @@ enum sgp_type {
SGP_WRITE, /* may exceed i_size, may allocate page */ SGP_WRITE, /* may exceed i_size, may allocate page */
}; };
#ifdef CONFIG_TMPFS
static unsigned long shmem_default_max_blocks(void) static unsigned long shmem_default_max_blocks(void)
{ {
return totalram_pages / 2; return totalram_pages / 2;
...@@ -94,6 +95,7 @@ static unsigned long shmem_default_max_inodes(void) ...@@ -94,6 +95,7 @@ static unsigned long shmem_default_max_inodes(void)
{ {
return min(totalram_pages - totalhigh_pages, totalram_pages / 2); return min(totalram_pages - totalhigh_pages, totalram_pages / 2);
} }
#endif
static int shmem_getpage(struct inode *inode, unsigned long idx, static int shmem_getpage(struct inode *inode, unsigned long idx,
struct page **pagep, enum sgp_type sgp, int *type); struct page **pagep, enum sgp_type sgp, int *type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment