X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fswapfile.c;h=f1f5ec783781cfebcbd4f3c5efe79336eaedcfa1;hb=4b648b0253c0976e944ea07e38a2d53ad4d0b30e;hp=cc367f7e75d87f39f27a3f4c214a9174b61e87fd;hpb=bbe5d235ee201705530a7153b57e141cd77d818b;p=powerpc.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index cc367f7e75..f1f5ec7837 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -5,7 +5,6 @@
  *  Swap reorganised 29.12.95, Stephen Tweedie
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
 #include <linux/mman.h>
@@ -443,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);