diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /fs | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 2 | ||||
| -rw-r--r-- | fs/fat/inode.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 3de8547ef..0f9c59c6c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -557,7 +557,7 @@ int shrink_dcache_memory(int priority, unsigned int gfp_mask) { int count = 0; if (priority) - count = dentry_stat.nr_unused >> (priority >> 2); + count = dentry_stat.nr_unused / priority; prune_dcache(count); /* FIXME: kmem_cache_shrink here should tell us the number of pages freed, and it should diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 046d384de..0874d6da7 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -854,6 +854,7 @@ retry: if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) { return; } + lock_kernel(); if (!(bh = fat_bread(sb, i_pos >> MSDOS_DPB_BITS))) { printk("dev = %s, ino = %d\n", kdevname(inode->i_dev), i_pos); fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block"); |