summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2002-07-29 01:27:26 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-07-29 01:27:26 -0700
commitd9acf5fe72b5d512be31685803b6f362a2a6bb23 (patch)
tree7fe4fdc741622e40684ad62cbe84e5fe71e2f9f0 /include/linux
parentde16834e42295433958e8af61730c872efcdf9de (diff)
[PATCH] shmem_file_setup when MAP_NORESERVE
If we support mmap MAP_NORESERVE, we should support it on shared anonymous objects: too bad that needs a few changes. do_mmap_pgoff pass VM_ACCOUNT (or not) down to shmem_file_setup, flag stored into shmem info, for use by shmem_delete_inode later. Also removed a harmless but pointless call to shmem_truncate.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mm.h2
-rw-r--r--include/linux/shmem_fs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7db061bc3468..cb48ce0f9d38 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -331,7 +331,7 @@ extern void show_free_areas(void);
extern int fail_writepage(struct page *);
struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused);
-struct file *shmem_file_setup(char * name, loff_t size);
+struct file *shmem_file_setup(char * name, loff_t size, unsigned long flags);
extern void shmem_lock(struct file * file, int lock);
extern int shmem_zero_setup(struct vm_area_struct *);
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index d4e0ab279388..9d39c403c0a0 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -16,7 +16,7 @@ struct shmem_inode_info {
swp_entry_t i_direct[SHMEM_NR_DIRECT]; /* for the first blocks */
void **i_indirect; /* indirect blocks */
unsigned long swapped;
- int locked; /* into memory */
+ unsigned long flags;
struct list_head list;
struct inode vfs_inode;
};