diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /fs/inode.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/inode.c b/fs/inode.c index bd48e5e6d3e8..7a6e8c2ff7b1 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -110,8 +110,8 @@ static void wake_up_inode(struct inode *inode) | |||
| 110 | 110 | ||
| 111 | /** | 111 | /** |
| 112 | * inode_init_always - perform inode structure intialisation | 112 | * inode_init_always - perform inode structure intialisation |
| 113 | * @sb - superblock inode belongs to. | 113 | * @sb: superblock inode belongs to |
| 114 | * @inode - inode to initialise | 114 | * @inode: inode to initialise |
| 115 | * | 115 | * |
| 116 | * These are initializations that need to be done on every inode | 116 | * These are initializations that need to be done on every inode |
| 117 | * allocation as the fields are not initialised by slab allocation. | 117 | * allocation as the fields are not initialised by slab allocation. |
| @@ -166,7 +166,7 @@ struct inode *inode_init_always(struct super_block *sb, struct inode *inode) | |||
| 166 | mapping->a_ops = &empty_aops; | 166 | mapping->a_ops = &empty_aops; |
| 167 | mapping->host = inode; | 167 | mapping->host = inode; |
| 168 | mapping->flags = 0; | 168 | mapping->flags = 0; |
| 169 | mapping_set_gfp_mask(mapping, GFP_HIGHUSER_PAGECACHE); | 169 | mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); |
| 170 | mapping->assoc_mapping = NULL; | 170 | mapping->assoc_mapping = NULL; |
| 171 | mapping->backing_dev_info = &default_backing_dev_info; | 171 | mapping->backing_dev_info = &default_backing_dev_info; |
| 172 | mapping->writeback_index = 0; | 172 | mapping->writeback_index = 0; |
| @@ -576,8 +576,8 @@ __inode_add_to_lists(struct super_block *sb, struct hlist_head *head, | |||
| 576 | 576 | ||
| 577 | /** | 577 | /** |
| 578 | * inode_add_to_lists - add a new inode to relevant lists | 578 | * inode_add_to_lists - add a new inode to relevant lists |
| 579 | * @sb - superblock inode belongs to. | 579 | * @sb: superblock inode belongs to |
| 580 | * @inode - inode to mark in use | 580 | * @inode: inode to mark in use |
| 581 | * | 581 | * |
| 582 | * When an inode is allocated it needs to be accounted for, added to the in use | 582 | * When an inode is allocated it needs to be accounted for, added to the in use |
| 583 | * list, the owning superblock and the inode hash. This needs to be done under | 583 | * list, the owning superblock and the inode hash. This needs to be done under |
| @@ -601,7 +601,7 @@ EXPORT_SYMBOL_GPL(inode_add_to_lists); | |||
| 601 | * @sb: superblock | 601 | * @sb: superblock |
| 602 | * | 602 | * |
| 603 | * Allocates a new inode for given superblock. The default gfp_mask | 603 | * Allocates a new inode for given superblock. The default gfp_mask |
| 604 | * for allocations related to inode->i_mapping is GFP_HIGHUSER_PAGECACHE. | 604 | * for allocations related to inode->i_mapping is GFP_HIGHUSER_MOVABLE. |
| 605 | * If HIGHMEM pages are unsuitable or it is known that pages allocated | 605 | * If HIGHMEM pages are unsuitable or it is known that pages allocated |
| 606 | * for the page cache are not reclaimable or migratable, | 606 | * for the page cache are not reclaimable or migratable, |
| 607 | * mapping_set_gfp_mask() must be called with suitable flags on the | 607 | * mapping_set_gfp_mask() must be called with suitable flags on the |