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
- landing b_fid.
[fs/lustre-release.git]
/
lustre
/
llite
/
llite_nfs.c
diff --git
a/lustre/llite/llite_nfs.c
b/lustre/llite/llite_nfs.c
index
93638fd
..
d052b2d
100644
(file)
--- a/
lustre/llite/llite_nfs.c
+++ b/
lustre/llite/llite_nfs.c
@@
-44,7
+44,7
@@
static struct inode * search_inode_for_lustre(struct super_block *sb,
{
struct ptlrpc_request *req = NULL;
struct ll_sb_info *sbi = ll_s2sbi(sb);
- struct l
l_fid f
id;
+ struct l
ustre_id
id;
unsigned long valid = 0;
int eadatalen = 0, rc;
struct inode *inode = NULL;
@@
-54,20
+54,21
@@
static struct inode * search_inode_for_lustre(struct super_block *sb,
if (inode)
return inode;
if (S_ISREG(mode)) {
- eadatalen = obd_size_diskmd(sbi->ll_
osc
_exp, NULL);
+ eadatalen = obd_size_diskmd(sbi->ll_
lov
_exp, NULL);
valid |= OBD_MD_FLEASIZE;
}
-
fid.id = (__u64)ino
;
-
fid.generation = generation
;
-
fid.f_type = mode
;
+
id.li_stc.u.e3s.l3s_type = mode
;
+
id.li_stc.u.e3s.l3s_ino = (__u64)ino
;
+
id.li_stc.u.e3s.l3s_gen = generation
;
- rc = md
c_getattr(sbi->ll_mdc_exp, &f
id, valid, eadatalen, &req);
+ rc = md
_getattr(sbi->ll_lmv_exp, &
id, valid, eadatalen, &req);
if (rc) {
CERROR("failure %d inode %lu\n", rc, ino);
return ERR_PTR(rc);
}
- rc = ll_prep_inode(sbi->ll_osc_exp, &inode, req, 0, sb);
+ rc = ll_prep_inode(sbi->ll_lov_exp, sbi->ll_lmv_exp,
+ &inode, req, 0, sb);
if (rc) {
ptlrpc_req_finished(req);
return ERR_PTR(rc);
@@
-115,7
+116,7
@@
static struct dentry *ll_iget_for_nfs(struct super_block *sb, unsigned long ino,
result = list_entry(lp,struct dentry, d_alias);
if (!(result->d_flags & DCACHE_DISCONNECTED)) {
dget_locked(result);
-
result->d_vfs_flags |= DCACHE_REFERENCED
;
+
ll_set_dflags(result, DCACHE_REFERENCED)
;
spin_unlock(&dcache_lock);
iput(inode);
return result;