Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-991 llite: cleanup md_readpage interface
[fs/lustre-release.git]
/
lustre
/
liblustre
/
dir.c
diff --git
a/lustre/liblustre/dir.c
b/lustre/liblustre/dir.c
index
846e228
..
5685b28
100644
(file)
--- a/
lustre/liblustre/dir.c
+++ b/
lustre/liblustre/dir.c
@@
-76,10
+76,10
@@
static int llu_dir_do_readpage(struct inode *inode, struct page *page)
struct lookup_intent it = { .it_op = IT_READDIR };
struct md_op_data op_data = {{ 0 }};
ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
struct lookup_intent it = { .it_op = IT_READDIR };
struct md_op_data op_data = {{ 0 }};
ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
- __u64 offset;
int rc = 0;
ENTRY;
int rc = 0;
ENTRY;
+ llu_prep_md_op_data(&op_data, inode, NULL, NULL, 0, 0, LUSTRE_OPC_ANY);
rc = md_lock_match(sbi->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
&lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh);
if (!rc) {
rc = md_lock_match(sbi->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
&lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh);
if (!rc) {
@@
-87,9
+87,6
@@
static int llu_dir_do_readpage(struct inode *inode, struct page *page)
llu_md_blocking_ast, ldlm_completion_ast, NULL, NULL,
inode};
llu_md_blocking_ast, ldlm_completion_ast, NULL, NULL,
inode};
- llu_prep_md_op_data(&op_data, inode, NULL, NULL, 0, 0,
- LUSTRE_OPC_ANY);
-
rc = md_enqueue(sbi->ll_md_exp, &einfo, &it,
&op_data, &lockh, NULL, 0, NULL,
LDLM_FL_CANCEL_ON_BLOCK);
rc = md_enqueue(sbi->ll_md_exp, &einfo, &it,
&op_data, &lockh, NULL, 0, NULL,
LDLM_FL_CANCEL_ON_BLOCK);
@@
-103,9
+100,9
@@
static int llu_dir_do_readpage(struct inode *inode, struct page *page)
}
ldlm_lock_dump_handle(D_OTHER, &lockh);
}
ldlm_lock_dump_handle(D_OTHER, &lockh);
- offset = (__u64)hash_x_index(page->index, 0);
- rc = md_readpage(sbi->ll_md_exp, &lli->lli_fid, NULL,
-
offset, &page, 1
, &request);
+ o
p_data.op_o
ffset = (__u64)hash_x_index(page->index, 0);
+ op_data.op_npages = 1;
+
rc = md_readpage(sbi->ll_md_exp, &op_data, &page
, &request);
if (!rc) {
body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
LASSERT(body != NULL); /* checked by md_readpage() */
if (!rc) {
body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
LASSERT(body != NULL); /* checked by md_readpage() */