Skip to content

fs/dax: check zero or empty entry before converting xarray entry #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vfsci-bot wants to merge 1 commit into
base: vfs.base.ci
Choose a base branch
from
Open

fs/dax: check zero or empty entry before converting xarray entry #1321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions fs/dax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,11 +443,12 @@ static void dax_associate_entry(void *entry, struct address_space *mapping,
unsigned long address, bool shared)
{
unsigned long size = dax_entry_size(entry), index;
struct folio *folio = dax_to_folio(entry);
struct folio *folio;

if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))
return;

folio = dax_to_folio(entry);
index = linear_page_index(vma, address & ~(size - 1));
if (shared && (folio->mapping || dax_folio_is_shared(folio))) {
if (folio->mapping)
Expand All @@ -468,21 +469,23 @@ static void dax_associate_entry(void *entry, struct address_space *mapping,
static void dax_disassociate_entry(void *entry, struct address_space *mapping,
bool trunc)
{
struct folio *folio = dax_to_folio(entry);
struct folio *folio;

if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))
return;

folio = dax_to_folio(entry);
dax_folio_put(folio);
}

static struct page *dax_busy_page(void *entry)
{
struct folio *folio = dax_to_folio(entry);
struct folio *folio;

if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))
return NULL;

folio = dax_to_folio(entry);
if (folio_ref_count(folio) - folio_mapcount(folio))
return &folio->page;
else
Expand Down
Loading