> On Wed, 6 Feb 2002, paule wrote:
>
> >Having just upgraded slackware8.0 (2.2 kernel)
> >to using 2.5.2, (2.5.3 patch install failed looking for malloc.h)
> >Im unable to use swap, despite it showing a success.
Known problem, fixed by Al Viro, additional fix by Andrey Panin:
--- 2.5.2/mm/swapfile.c Sat Jan 19 21:13:17 2002
+++ linux/mm/swapfile.c Wed Feb 6 15:36:10 2002
@@ -904,11 +904,12 @@
swap_file = filp_open(name, O_RDWR, 0);
putname(name);
error = PTR_ERR(swap_file);
- if (error)
+ if (IS_ERR(swap_file))
goto bad_swap_2;
p->swap_file = swap_file;
+ error = -EINVAL;
if (S_ISBLK(swap_file->f_dentry->d_inode->i_mode)) {
p->swap_device = swap_file->f_dentry->d_inode->i_rdev;
set_blocksize(p->swap_device, PAGE_SIZE);
@@ -1072,7 +1073,7 @@
swap_list_unlock();
if (swap_map)
vfree(swap_map);
- if (swap_file)
+ if (swap_file && !IS_ERR(swap_file))
filp_close(swap_file, NULL);
out:
if (swap_header)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Feb 07 2002 - 21:00:50 EST