diff options
| author | Takashi Iwai <[email protected]> | 2017-01-03 11:39:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2017-01-03 11:39:30 +0100 |
| commit | 337ccfce2332ecd37a793afb72da4250ed59a866 (patch) | |
| tree | 606ac17ca161b487ed2fc37eb3b0be35f213c838 /include/linux | |
| parent | b0e159fe34f76abf4ae23a6c799f43b8c520695b (diff) | |
| parent | 6b7e95d1336b9eb0d4c6db190ce756480496bd13 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dax.h | 3 | ||||
| -rw-r--r-- | include/linux/page-flags.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/dax.h b/include/linux/dax.h index f97bcfe79472..24ad71173995 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -41,6 +41,9 @@ ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter, int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf, struct iomap_ops *ops); int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); +int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index); +int dax_invalidate_mapping_entry_sync(struct address_space *mapping, + pgoff_t index); void dax_wake_mapping_entry_waiter(struct address_space *mapping, pgoff_t index, void *entry, bool wake_all); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index c56b39890a41..6b5818d6de32 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -73,13 +73,13 @@ */ enum pageflags { PG_locked, /* Page is locked. Don't touch. */ - PG_waiters, /* Page has waiters, check its waitqueue */ PG_error, PG_referenced, PG_uptodate, PG_dirty, PG_lru, PG_active, + PG_waiters, /* Page has waiters, check its waitqueue. Must be bit #7 and in the same byte as "PG_locked" */ PG_slab, PG_owner_priv_1, /* Owner use. If pagecache, fs may use*/ PG_arch_1, |