pandora: update defconfig

[pandora-kernel.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index eb086e0..03aa2d5 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -577,6 +577,7 @@ 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)
@@ -586,6 +587,9 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
                        swap_list.next = p->type;
                nr_swap_pages++;
                p->inuse_pages--;
+               if ((p->flags & SWP_BLKDEV) &&
+                               disk->fops->swap_slot_free_notify)
+                       disk->fops->swap_slot_free_notify(p->bdev, offset);
        }
 
        return usage;
@@ -1887,6 +1891,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                if (error < 0)
                        goto bad_swap;
                p->bdev = bdev;
+               p->flags |= SWP_BLKDEV;
        } else if (S_ISREG(inode->i_mode)) {
                p->bdev = inode->i_sb->s_bdev;
                mutex_lock(&inode->i_mutex);