mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-19 21:28:36 +03:00
5ef70c6dac
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22458 3c298f89-4303-0410-b956-a3cf2f4a3e73
31 lines
1022 B
Diff
31 lines
1022 B
Diff
--- a/include/linux/blkdev.h
|
|
+++ b/include/linux/blkdev.h
|
|
@@ -1301,6 +1301,8 @@ struct block_device_operations {
|
|
unsigned long long);
|
|
int (*revalidate_disk) (struct gendisk *);
|
|
int (*getgeo)(struct block_device *, struct hd_geometry *);
|
|
+ /* this callback is with swap_lock and sometimes page table lock held */
|
|
+ void (*swap_slot_free_notify) (struct block_device *, unsigned long);
|
|
struct module *owner;
|
|
};
|
|
|
|
--- a/mm/swapfile.c
|
|
+++ b/mm/swapfile.c
|
|
@@ -574,6 +574,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)
|
|
@@ -583,6 +584,8 @@ static unsigned char swap_entry_free(struct swap_info_struct *p,
|
|
swap_list.next = p->type;
|
|
nr_swap_pages++;
|
|
p->inuse_pages--;
|
|
+ if (disk->fops->swap_slot_free_notify)
|
|
+ disk->fops->swap_slot_free_notify(p->bdev, offset);
|
|
}
|
|
|
|
return usage;
|