[PATCH][Fix] swsusp: Fix swap_type_of

[PATCH][Fix] swsusp: Fix swap_type_of

[Rafael J. Wysocki]

There is a bug in mm/swapfile.c#swap_type_of() that makes swsusp only be
able to use the first active swap partition as the resume device.  Fix it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 mm/swapfile.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.18-rc4-mm1/mm/swapfile.c
===================================================================
--- linux-2.6.18-rc4-mm1.orig/mm/swapfile.c	2006-08-13 14:54:43.000000000 +0200
+++ linux-2.6.18-rc4-mm1/mm/swapfile.c	2006-08-14 21:09:09.000000000 +0200
@@ -442,11 +442,12 @@ int swap_type_of(dev_t device)
 
 		if (!(swap_info[i].flags & SWP_WRITEOK))
 			continue;
+
 		if (!device) {
 			spin_unlock(&swap_lock);
 			return i;
 		}
-		inode = swap_info->swap_file->f_dentry->d_inode;
+		inode = swap_info[i].swap_file->f_dentry->d_inode;
 		if (S_ISBLK(inode->i_mode) &&
 		    device == MKDEV(imajor(inode), iminor(inode))) {
 			spin_unlock(&swap_lock);

Re: [PATCH][Fix] swsusp: Fix swap_type_of

[Pavel Machek]

On Tue 2006-08-15 12:18:40, Rafael J. Wysocki wrote:
> There is a bug in mm/swapfile.c#swap_type_of() that makes swsusp only be
> able to use the first active swap partition as the resume device.
> Fix it.

ACK. (And I guess this is 2.6.18 material, right? Or is that fix not
needed in mainline?) 
								Pavel

> Index: linux-2.6.18-rc4-mm1/mm/swapfile.c
> ===================================================================
> --- linux-2.6.18-rc4-mm1.orig/mm/swapfile.c	2006-08-13 14:54:43.000000000 +0200
> +++ linux-2.6.18-rc4-mm1/mm/swapfile.c	2006-08-14 21:09:09.000000000 +0200
> @@ -442,11 +442,12 @@ int swap_type_of(dev_t device)
>  
>  		if (!(swap_info[i].flags & SWP_WRITEOK))
>  			continue;
> +
>  		if (!device) {
>  			spin_unlock(&swap_lock);
>  			return i;
>  		}
> -		inode = swap_info->swap_file->f_dentry->d_inode;
> +		inode = swap_info[i].swap_file->f_dentry->d_inode;
>  		if (S_ISBLK(inode->i_mode) &&
>  		    device == MKDEV(imajor(inode), iminor(inode))) {
>  			spin_unlock(&swap_lock);

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH][Fix] swsusp: Fix swap_type_of

[Rafael J. Wysocki]

On Tuesday 15 August 2006 12:16, Pavel Machek wrote:
> On Tue 2006-08-15 12:18:40, Rafael J. Wysocki wrote:
> > There is a bug in mm/swapfile.c#swap_type_of() that makes swsusp only be
> > able to use the first active swap partition as the resume device.
> > Fix it.
> 
> ACK. (And I guess this is 2.6.18 material, right? Or is that fix not
> needed in mainline?) 

Oh, yes I think it is needed.  2.6.18 material, surely.

Rafael


-- 
You never change things by fighting the existing reality.
		R. Buckminster Fuller

Re: [PATCH][Fix] swsusp: Fix swap_type_of

[Antonino A. Daplas]

On Tue, 2006-08-15 at 12:16 +0200, Pavel Machek wrote:
> On Tue 2006-08-15 12:18:40, Rafael J. Wysocki wrote:
> > There is a bug in mm/swapfile.c#swap_type_of() that makes swsusp only be
> > able to use the first active swap partition as the resume device.
> > Fix it.
> 
> ACK. (And I guess this is 2.6.18 material, right? Or is that fix not
> needed in mainline?) 

This fixed an oops on suspend to disk.  Definitely 2.6.18 material.

Tony