diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /mm/swapfile.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index dd66701b5..42ca4900a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -556,7 +556,7 @@ asmlinkage int sys_swapon(const char * specialfile, int swap_flags) for (i = 0 ; i < nr_swapfiles ; i++) { if (i == type) continue; - if (p->swap_file == swap_info[i].swap_file) + if (swap_dentry->d_inode == swap_info[i].swap_file->d_inode) goto bad_swap; } } else @@ -701,6 +701,8 @@ bad_swap_2: p->swap_map = NULL; p->swap_lockmap = NULL; p->flags = 0; + if (!(swap_flags & SWAP_FLAG_PREFER)) + ++least_priority; out: if (swap_header) free_page((long) swap_header); |