Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 48ce82926d931bef026baf16a971add9d00c45fd..3b8b73928398dc25e95ca807557a0506d4438961 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -548,12 +548,12 @@ static int shmem_getattr(struct vfsmount *mnt, struct dentry *dentry,
        struct inode *inode = dentry->d_inode;
        struct shmem_inode_info *info = SHMEM_I(inode);
 
-       spin_lock(&info->lock);
-       shmem_recalc_inode(inode);
-       spin_unlock(&info->lock);
-
+       if (info->alloced - info->swapped != inode->i_mapping->nrpages) {
+               spin_lock(&info->lock);
+               shmem_recalc_inode(inode);
+               spin_unlock(&info->lock);
+       }
        generic_fillattr(inode, stat);
-
        return 0;
 }
 
@@ -586,10 +586,16 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr)
                }
                if (newsize <= oldsize) {
                        loff_t holebegin = round_up(newsize, PAGE_SIZE);
-                       unmap_mapping_range(inode->i_mapping, holebegin, 0, 1);
-                       shmem_truncate_range(inode, newsize, (loff_t)-1);
+                       if (oldsize > holebegin)
+                               unmap_mapping_range(inode->i_mapping,
+                                                       holebegin, 0, 1);
+                       if (info->alloced)
+                               shmem_truncate_range(inode,
+                                                       newsize, (loff_t)-1);
                        /* unmap again to remove racily COWed private pages */
-                       unmap_mapping_range(inode->i_mapping, holebegin, 0, 1);
+                       if (oldsize > holebegin)
+                               unmap_mapping_range(inode->i_mapping,
+                                                       holebegin, 0, 1);
                }
        }
 
@@ -1023,7 +1029,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
                 */
                oldpage = newpage;
        } else {
-               mem_cgroup_migrate(oldpage, newpage, true);
+               mem_cgroup_replace_page(oldpage, newpage);
                lru_cache_add_anon(newpage);
                *pagep = newpage;
        }