diff --git a/[refs] b/[refs]
index 15a6ea4b4241..cf2eec086502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c06aad854fdb9da38fcc22dccfe9d72919453e43
+refs/heads/master: b6b5bce3571e496504a89ee575d32101e0a98b93
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
index e70d6c6d6fee..f1f5ec783781 100644
--- a/trunk/mm/swapfile.c
+++ b/trunk/mm/swapfile.c
@@ -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);