Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Trond Myklebust [Tue, 20 Jun 2006 12:59:45 +0000 (08:59 -0400)]
1  2 
mm/shmem.c

diff --combined mm/shmem.c
@@@ -1780,6 -1780,7 +1780,7 @@@ static int shmem_rmdir(struct inode *di
        if (!simple_empty(dentry))
                return -ENOTEMPTY;
  
+       dentry->d_inode->i_nlink--;
        dir->i_nlink--;
        return shmem_unlink(dir, dentry);
  }
@@@ -2102,6 -2103,7 +2103,7 @@@ static int shmem_fill_super(struct supe
        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)
@@@ -2261,7 -2263,7 +2263,7 @@@ static int __init init_tmpfs(void
  #ifdef CONFIG_TMPFS
        devfs_mk_dir("shm");
  #endif
 -      shm_mnt = do_kern_mount(tmpfs_fs_type.name, MS_NOUSER,
 +      shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER,
                                tmpfs_fs_type.name, NULL);
        if (IS_ERR(shm_mnt)) {
                error = PTR_ERR(shm_mnt);