summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-19 09:21:08 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-19 09:21:08 -0400
commit2b3d6e2f23362b71de173649002d915d14e07622 (patch)
tree6c1aab54bb16b4f0d06cd3b838e3e41d8488fb98 /mm
parent7d5513d58d072cf38cae9c886653aadac38ef4a9 (diff)
parent427abfa28afedffadfca9dd8b067eb6d36bac53f (diff)
downloadkernel-crypto-2b3d6e2f23362b71de173649002d915d14e07622.tar.gz
kernel-crypto-2b3d6e2f23362b71de173649002d915d14e07622.tar.xz
kernel-crypto-2b3d6e2f23362b71de173649002d915d14e07622.zip
Merge branch 'master'
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c2
-rw-r--r--mm/vmscan.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 4c5e68e4e9a..1e43c8a865b 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1780,6 +1780,7 @@ static int shmem_rmdir(struct inode *dir, struct dentry *dentry)
if (!simple_empty(dentry))
return -ENOTEMPTY;
+ dentry->d_inode->i_nlink--;
dir->i_nlink--;
return shmem_unlink(dir, dentry);
}
@@ -2102,6 +2103,7 @@ static int shmem_fill_super(struct super_block *sb,
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = TMPFS_MAGIC;
sb->s_op = &shmem_ops;
+ sb->s_time_gran = 1;
inode = shmem_get_inode(sb, S_IFDIR | mode, 0);
if (!inode)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 4649a63a8cb..440a733fe2e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1061,7 +1061,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, unsigned long nr_pages,
loop_again:
total_scanned = 0;
nr_reclaimed = 0;
- sc.may_writepage = !laptop_mode,
+ sc.may_writepage = !laptop_mode;
sc.nr_mapped = read_page_state(nr_mapped);
inc_page_state(pageoutrun);