From 082f33a8c2a710fd020023d1bfbed3f333b2178b Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 28 Jul 2008 15:46:19 -0700 Subject: [PATCH] --- yaml --- r: 106924 b: refs/heads/master c: 14fcc23fdc78e9d32372553ccf21758a9bd56fa1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/shmem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b33dd07cc84..4cac647d0fdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca5b172bd2b2fe489e7ba11cedd46ddf772d132f +refs/heads/master: 14fcc23fdc78e9d32372553ccf21758a9bd56fa1 diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c index 952d361774bb..c1e5a3b4f758 100644 --- a/trunk/mm/shmem.c +++ b/trunk/mm/shmem.c @@ -1513,7 +1513,6 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev) inode->i_uid = current->fsuid; inode->i_gid = current->fsgid; inode->i_blocks = 0; - inode->i_mapping->a_ops = &shmem_aops; inode->i_mapping->backing_dev_info = &shmem_backing_dev_info; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_generation = get_seconds(); @@ -1528,6 +1527,7 @@ shmem_get_inode(struct super_block *sb, int mode, dev_t dev) init_special_inode(inode, mode, dev); break; case S_IFREG: + inode->i_mapping->a_ops = &shmem_aops; inode->i_op = &shmem_inode_operations; inode->i_fop = &shmem_file_operations; mpol_shared_policy_init(&info->policy, @@ -1929,6 +1929,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s return error; } unlock_page(page); + inode->i_mapping->a_ops = &shmem_aops; inode->i_op = &shmem_symlink_inode_operations; kaddr = kmap_atomic(page, KM_USER0); memcpy(kaddr, symname, len);