aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/swapfile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index aafcf3611b31..71b42ec55b78 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2088,7 +2088,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
2088 2088
2089 p->swap_file = swap_file; 2089 p->swap_file = swap_file;
2090 mapping = swap_file->f_mapping; 2090 mapping = swap_file->f_mapping;
2091 inode = mapping->host;
2092 2091
2093 for (i = 0; i < nr_swapfiles; i++) { 2092 for (i = 0; i < nr_swapfiles; i++) {
2094 struct swap_info_struct *q = swap_info[i]; 2093 struct swap_info_struct *q = swap_info[i];
@@ -2101,6 +2100,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
2101 } 2100 }
2102 } 2101 }
2103 2102
2103 inode = mapping->host;
2104 /* If S_ISREG(inode->i_mode) will do mutex_lock(&inode->i_mutex); */
2104 error = claim_swapfile(p, inode); 2105 error = claim_swapfile(p, inode);
2105 if (unlikely(error)) 2106 if (unlikely(error))
2106 goto bad_swap; 2107 goto bad_swap;
@@ -2187,8 +2188,10 @@ bad_swap:
2187 spin_unlock(&swap_lock); 2188 spin_unlock(&swap_lock);
2188 vfree(swap_map); 2189 vfree(swap_map);
2189 if (swap_file) { 2190 if (swap_file) {
2190 if (inode && S_ISREG(inode->i_mode)) 2191 if (inode && S_ISREG(inode->i_mode)) {
2191 mutex_unlock(&inode->i_mutex); 2192 mutex_unlock(&inode->i_mutex);
2193 inode = NULL;
2194 }
2192 filp_close(swap_file, NULL); 2195 filp_close(swap_file, NULL);
2193 } 2196 }
2194out: 2197out: