AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 22:55:20 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: llite: pass inode to ll_release_page

Browse Source 
Add a inode parameter to ll_release_page. This will be
used in the future.

Signed-off-by: wang di <di.wang@intel.com>
Reviewed-on: http://review.whamcloud.com/7043
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3531
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
wang di 2016-08-16 16:18:17 -04:00 committed by Greg Kroah-Hartman
parent 5b8d985231
commit 006e4dcd41
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/lustre/lustre/llite/dir.c
View File

@ -236,7 +236,7 @@ static int ll_dir_filler(void *_hash, struct page *page0)
return rc; return rc;
} }
void ll_release_page(struct page *page, int remove) void ll_release_page(struct inode *inode, struct page *page, int remove)
{ {
kunmap(page); kunmap(page);
if (remove) { if (remove) {
@ -297,7 +297,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash,
CDEBUG(D_VFSTRACE, "page %lu [%llu %llu], hash %llu\n", CDEBUG(D_VFSTRACE, "page %lu [%llu %llu], hash %llu\n",
offset, *start, *end, *hash); offset, *start, *end, *hash);
if (*hash > *end) { if (*hash > *end) {
ll_release_page(page, 0); ll_release_page(dir, page, 0);
page = NULL; page = NULL;
} else if (*end != *start && *hash == *end) { } else if (*end != *start && *hash == *end) {
/* /*
@ -306,8 +306,9 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash,
* ll_get_dir_page() will issue RPC to fetch * ll_get_dir_page() will issue RPC to fetch
* the page we want. * the page we want.
*/ */
ll_release_page(page, ll_release_page(dir, page,
le32_to_cpu(dp->ldp_flags) & LDF_COLLIDE); le32_to_cpu(dp->ldp_flags) &
LDF_COLLIDE);
page = NULL; page = NULL;
} }
} else { } else {
@ -462,7 +463,7 @@ struct page *ll_get_dir_page(struct inode *dir, struct md_op_data *op_data,
return page; return page;
fail: fail:
ll_release_page(page, 1); ll_release_page(dir, page, 1);
page = ERR_PTR(-EIO); page = ERR_PTR(-EIO);
goto out_unlock; goto out_unlock;
} }
@ -560,7 +561,7 @@ int ll_dir_read(struct inode *inode, __u64 *ppos, struct md_op_data *op_data,
if (done) { if (done) {
pos = hash; pos = hash;
ll_release_page(page, 0); ll_release_page(inode, page, 0);
break; break;
} }
@ -571,13 +572,13 @@ int ll_dir_read(struct inode *inode, __u64 *ppos, struct md_op_data *op_data,
* End of directory reached. * End of directory reached.
*/ */
done = 1; done = 1;
ll_release_page(page, 0); ll_release_page(inode, page, 0);
} else { } else {
/* /*
* Normal case: continue to the next * Normal case: continue to the next
* page. * page.
*/ */
ll_release_page(page, ll_release_page(inode, page,
le32_to_cpu(dp->ldp_flags) & le32_to_cpu(dp->ldp_flags) &
LDF_COLLIDE); LDF_COLLIDE);
next = pos; next = pos;

2
drivers/staging/lustre/lustre/llite/llite_internal.h
View File

@ -655,7 +655,7 @@ int ll_dir_read(struct inode *inode, __u64 *ppos, struct md_op_data *op_data,
int ll_get_mdt_idx(struct inode *inode); int ll_get_mdt_idx(struct inode *inode);
struct page *ll_get_dir_page(struct inode *dir, struct md_op_data *op_data, struct page *ll_get_dir_page(struct inode *dir, struct md_op_data *op_data,
__u64 hash, struct ll_dir_chain *chain); __u64 hash, struct ll_dir_chain *chain);
void ll_release_page(struct page *page, int remove); void ll_release_page(struct inode *inode, struct page *page, int remove);
/* llite/namei.c */ /* llite/namei.c */
extern const struct inode_operations ll_special_inode_operations; extern const struct inode_operations ll_special_inode_operations;

20
drivers/staging/lustre/lustre/llite/statahead.c
View File

@ -1142,7 +1142,7 @@ static int ll_statahead_thread(void *arg)
ll_post_statahead(sai); ll_post_statahead(sai);
if (unlikely(!thread_is_running(thread))) { if (unlikely(!thread_is_running(thread))) {
ll_release_page(page, 0); ll_release_page(dir, page, 0);
rc = 0; rc = 0;
goto out; goto out;
} }
@ -1166,7 +1166,7 @@ static int ll_statahead_thread(void *arg)
if (unlikely( if (unlikely(
!thread_is_running(thread))) { !thread_is_running(thread))) {
ll_release_page(page, 0); ll_release_page(dir, page, 0);
rc = 0; rc = 0;
goto out; goto out;
} }
@ -1189,7 +1189,7 @@ static int ll_statahead_thread(void *arg)
/* /*
* End of directory reached. * End of directory reached.
*/ */
ll_release_page(page, 0); ll_release_page(dir, page, 0);
while (1) { while (1) {
l_wait_event(thread->t_ctl_waitq, l_wait_event(thread->t_ctl_waitq,
!list_empty(&sai->sai_entries_received) || !list_empty(&sai->sai_entries_received) ||
@ -1229,8 +1229,9 @@ static int ll_statahead_thread(void *arg)
* chain is exhausted. * chain is exhausted.
* Normal case: continue to the next page. * Normal case: continue to the next page.
*/ */
ll_release_page(page, le32_to_cpu(dp->ldp_flags) & ll_release_page(dir, page,
LDF_COLLIDE); le32_to_cpu(dp->ldp_flags) &
LDF_COLLIDE);
sai->sai_in_readpage = 1; sai->sai_in_readpage = 1;
page = ll_get_dir_page(dir, op_data, pos, &chain); page = ll_get_dir_page(dir, op_data, pos, &chain);
sai->sai_in_readpage = 0; sai->sai_in_readpage = 0;
@ -1427,7 +1428,7 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
else else
rc = LS_FIRST_DOT_DE; rc = LS_FIRST_DOT_DE;
ll_release_page(page, 0); ll_release_page(dir, page, 0);
goto out; goto out;
} }
pos = le64_to_cpu(dp->ldp_hash_end); pos = le64_to_cpu(dp->ldp_hash_end);
@ -1435,15 +1436,16 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
/* /*
* End of directory reached. * End of directory reached.
*/ */
ll_release_page(page, 0); ll_release_page(dir, page, 0);
goto out; goto out;
} else { } else {
/* /*
* chain is exhausted * chain is exhausted
* Normal case: continue to the next page. * Normal case: continue to the next page.
*/ */
ll_release_page(page, le32_to_cpu(dp->ldp_flags) & ll_release_page(dir, page,
LDF_COLLIDE); le32_to_cpu(dp->ldp_flags) &
LDF_COLLIDE);
page = ll_get_dir_page(dir, op_data, pos, &chain); page = ll_get_dir_page(dir, op_data, pos, &chain);
} }
} }