1 files changed, 6 insertions, 4 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 7307fc928d7b..63958d60ecb0 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -549,7 +549,6 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
 
         /* free if no reference */
         if (!usage) {
-                struct gendisk *disk = p->bdev->bd_disk;
                 if (offset < p->lowest_bit)
                         p->lowest_bit = offset;
                 if (offset > p->highest_bit)
@@ -560,9 +559,12 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
                 nr_swap_pages++;
                 p->inuse_pages--;
                 frontswap_invalidate_page(p->type, offset);
-                if ((p->flags & SWP_BLKDEV) &&
-                                disk->fops->swap_slot_free_notify)
-                        disk->fops->swap_slot_free_notify(p->bdev, offset);
+                if (p->flags & SWP_BLKDEV) {
+                        struct gendisk *disk = p->bdev->bd_disk;
+                        if (disk->fops->swap_slot_free_notify)
+                                disk->fops->swap_slot_free_notify(p->bdev,
+                                                                  offset);
+                }
         }
 
         return usage;