Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block
Pull misc fixes from Jens Axboe:
"Two misc fixes that don't belong in other branches:
- Fix a regression with ia64 signals, introduced by the
TIF_NOTIFY_SIGNAL change in 5.11.
- Fix the current swapfile regression from this merge window"
* tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block:
swap: fix swapfile read/write offset
ia64: don't call handle_signal() unless there's actually a signal queued
+16
-6
+2
-1
arch/ia64/kernel/signal.c
+2
-1
arch/ia64/kernel/signal.c
+1
include/linux/swap.h
+1
include/linux/swap.h
···
485
485
extern int init_swap_address_space(unsigned int type, unsigned long nr_pages);
486
486
extern void exit_swap_address_space(unsigned int type);
487
487
extern struct swap_info_struct *get_swap_device(swp_entry_t entry);
488
+
sector_t swap_page_sector(struct page *page);
488
489
489
490
static inline void put_swap_device(struct swap_info_struct *si)
490
491
{
-5
mm/page_io.c
-5
mm/page_io.c
···
254
254
return ret;
255
255
}
256
256
257
-
static sector_t swap_page_sector(struct page *page)
258
-
{
259
-
return (sector_t)__page_file_index(page) << (PAGE_SHIFT - 9);
260
-
}
261
-
262
257
static inline void count_swpout_vm_event(struct page *page)
263
258
{
264
259
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+13
mm/swapfile.c
+13
mm/swapfile.c
···
219
219
BUG();
220
220
}
221
221
222
+
sector_t swap_page_sector(struct page *page)
223
+
{
224
+
struct swap_info_struct *sis = page_swap_info(page);
225
+
struct swap_extent *se;
226
+
sector_t sector;
227
+
pgoff_t offset;
228
+
229
+
offset = __page_file_index(page);
230
+
se = offset_to_swap_extent(sis, offset);
231
+
sector = se->start_block + (offset - se->start_page);
232
+
return sector << (PAGE_SHIFT - 9);
233
+
}
234
+
222
235
/*
223
236
* swap allocation tell device that a cluster of swap can now be discarded,
224
237
* to allow the swap device to optimize its wear-levelling.