X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Fswapfile.c;fp=mm%2Fswapfile.c;h=a3bed3ff34850360210a9ea236fdcfd75acec8f5;hb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;hp=234b2f173332c4e6a25ae3b396c1edf0da10222e;hpb=1db395853d4f30d6120458bd279ede1f882a8525;p=linux-2.6.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 234b2f173..a3bed3ff3 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -441,11 +441,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);