1 files changed, 4 insertions, 4 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 058a9dfefefd..10f2b33805f6 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2074,6 +2074,10 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                 goto bad_swap;
         }
 
+        error = swap_cgroup_swapon(p->type, maxpages);
+        if (error)
+                goto bad_swap;
+
         nr_good_pages = maxpages - 1;   /* omit header page */
 
         for (i = 0; i < swap_header->info.nr_badpages; i++) {
@@ -2088,10 +2092,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                 }
         }
 
-        error = swap_cgroup_swapon(p->type, maxpages);
-        if (error)
-                goto bad_swap;
-
         if (nr_good_pages) {
                 swap_map[0] = SWAP_MAP_BAD;
                 p->max = maxpages;