LU-1187 tests: Fixes in test-framework for DNE

[fs/lustre-release.git] / lustre / llite / llite_nfs.c

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index a0d581b..1f18337 100644 (file)
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -144,7 +144,7 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
          * It is an anonymous dentry without OST objects created yet.
          * We have to find the parent to tell MDS how to init lov objects.
          */
-        if (S_ISREG(inode->i_mode) && ll_i2info(inode)->lli_smd == NULL &&
+       if (S_ISREG(inode->i_mode) && !ll_i2info(inode)->lli_has_smd &&
             parent != NULL) {
                 struct ll_inode_info *lli = ll_i2info(inode);
 
@@ -217,8 +217,8 @@ static int ll_get_name(struct dentry *dentry, char *name,
                        struct dentry *child)
 {
         struct inode *dir = dentry->d_inode;
-        struct file *filp;
         struct ll_getname_data lgd;
+       __u64 offset = 0;
         int rc;
         ENTRY;
 
@@ -228,27 +228,17 @@ static int ll_get_name(struct dentry *dentry, char *name,
         if (!dir->i_fop)
                 GOTO(out, rc = -EINVAL);
 
-        filp = ll_dentry_open(dget(dentry), mntget(ll_i2sbi(dir)->ll_mnt),
-                              O_RDONLY, current_cred());
-        if (IS_ERR(filp))
-                GOTO(out, rc = PTR_ERR(filp));
-
-        if (!filp->f_op->readdir)
-                GOTO(out_close, rc = -EINVAL);
-
         lgd.lgd_name = name;
         lgd.lgd_fid = ll_i2info(child->d_inode)->lli_fid;
         lgd.lgd_found = 0;
 
         cfs_mutex_lock(&dir->i_mutex);
-        rc = ll_readdir(filp, &lgd, ll_nfs_get_name_filldir);
+       rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir);
         cfs_mutex_unlock(&dir->i_mutex);
         if (!rc && !lgd.lgd_found)
                 rc = -ENOENT;
         EXIT;
 
-out_close:
-        fput(filp);
 out:
         return rc;
 }