diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-06-21 13:43:50 -0700 |
|---|---|---|
| committer | Auke-jan Kok <ahkok@gitlost.site> | 2006-06-21 13:43:50 -0700 |
| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd (patch) | |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a /mm/shmem.c | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec (diff) | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| download | kernel-crypto-0d204094d15dac2e8a439b993f71eda385b4dccd.tar.gz kernel-crypto-0d204094d15dac2e8a439b993f71eda385b4dccd.tar.xz kernel-crypto-0d204094d15dac2e8a439b993f71eda385b4dccd.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 2 insertions, 0 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) |