1 files changed, 6 insertions, 5 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index cc367f7e75d8..a15def63f28f 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);
@@ -1723,13 +1723,14 @@ get_swap_info_struct(unsigned type)
  */
 int valid_swaphandles(swp_entry_t entry, unsigned long *offset)
 {
-        int ret = 0, i = 1 << page_cluster;
+        int our_page_cluster = page_cluster;
+        int ret = 0, i = 1 << our_page_cluster;
         unsigned long toff;
         struct swap_info_struct *swapdev = swp_type(entry) + swap_info;
 
-        if (!page_cluster)      /* no readahead */
+        if (!our_page_cluster)  /* no readahead */
                 return 0;
-        toff = (swp_offset(entry) >> page_cluster) << page_cluster;
+        toff = (swp_offset(entry) >> our_page_cluster) << our_page_cluster;
         if (!toff)              /* first page is swap header */
                 toff++, i--;
         *offset = toff;