diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /mm/shmem.c | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5d0de96c978..19d566ccdee 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -2628,7 +2628,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) | |||
| 2628 | goto close_file; | 2628 | goto close_file; |
| 2629 | 2629 | ||
| 2630 | #ifdef CONFIG_SHMEM | 2630 | #ifdef CONFIG_SHMEM |
| 2631 | SHMEM_I(inode)->flags = flags & VM_ACCOUNT; | 2631 | SHMEM_I(inode)->flags = (flags & VM_NORESERVE) ? 0 : VM_ACCOUNT; |
| 2632 | #endif | 2632 | #endif |
| 2633 | d_instantiate(dentry, inode); | 2633 | d_instantiate(dentry, inode); |
| 2634 | inode->i_size = size; | 2634 | inode->i_size = size; |