mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 02:00:54 +07:00
orangefs: use attach/detach_page_private
Since the new pair function is introduced, we can call them to clean the code in orangefs. Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Tested-by: Mike Marshall <hubcap@omnibond.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Martin Brandenburg <martin@omnibond.com> Link: http://lkml.kernel.org/r/20200517214718.468-9-guoqing.jiang@cloud.ionos.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
14ed109e3f
commit
4c42be38c2
@ -62,12 +62,7 @@ static int orangefs_writepage_locked(struct page *page,
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
if (wr) {
|
||||
kfree(wr);
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
put_page(page);
|
||||
}
|
||||
kfree(detach_page_private(page));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -409,9 +404,7 @@ static int orangefs_write_begin(struct file *file,
|
||||
wr->len = len;
|
||||
wr->uid = current_fsuid();
|
||||
wr->gid = current_fsgid();
|
||||
SetPagePrivate(page);
|
||||
set_page_private(page, (unsigned long)wr);
|
||||
get_page(page);
|
||||
attach_page_private(page, wr);
|
||||
okay:
|
||||
return 0;
|
||||
}
|
||||
@ -459,18 +452,12 @@ static void orangefs_invalidatepage(struct page *page,
|
||||
wr = (struct orangefs_write_range *)page_private(page);
|
||||
|
||||
if (offset == 0 && length == PAGE_SIZE) {
|
||||
kfree((struct orangefs_write_range *)page_private(page));
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
put_page(page);
|
||||
kfree(detach_page_private(page));
|
||||
return;
|
||||
/* write range entirely within invalidate range (or equal) */
|
||||
} else if (page_offset(page) + offset <= wr->pos &&
|
||||
wr->pos + wr->len <= page_offset(page) + offset + length) {
|
||||
kfree((struct orangefs_write_range *)page_private(page));
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
put_page(page);
|
||||
kfree(detach_page_private(page));
|
||||
/* XXX is this right? only caller in fs */
|
||||
cancel_dirty_page(page);
|
||||
return;
|
||||
@ -535,12 +522,7 @@ static int orangefs_releasepage(struct page *page, gfp_t foo)
|
||||
|
||||
static void orangefs_freepage(struct page *page)
|
||||
{
|
||||
if (PagePrivate(page)) {
|
||||
kfree((struct orangefs_write_range *)page_private(page));
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
put_page(page);
|
||||
}
|
||||
kfree(detach_page_private(page));
|
||||
}
|
||||
|
||||
static int orangefs_launder_page(struct page *page)
|
||||
@ -740,9 +722,7 @@ vm_fault_t orangefs_page_mkwrite(struct vm_fault *vmf)
|
||||
wr->len = PAGE_SIZE;
|
||||
wr->uid = current_fsuid();
|
||||
wr->gid = current_fsgid();
|
||||
SetPagePrivate(page);
|
||||
set_page_private(page, (unsigned long)wr);
|
||||
get_page(page);
|
||||
attach_page_private(page, wr);
|
||||
okay:
|
||||
|
||||
file_update_time(vmf->vma->vm_file);
|
||||
|
Loading…
Reference in New Issue
Block a user