-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011 Whamcloud, Inc.
- *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* 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 &&
- parent != NULL) {
- struct ll_inode_info *lli = ll_i2info(inode);
+ if (S_ISREG(inode->i_mode) && !ll_i2info(inode)->lli_has_smd &&
+ parent != NULL) {
+ struct ll_inode_info *lli = ll_i2info(inode);
- cfs_spin_lock(&lli->lli_lock);
- lli->lli_pfid = *parent;
- cfs_spin_unlock(&lli->lli_lock);
- }
+ spin_lock(&lli->lli_lock);
+ lli->lli_pfid = *parent;
+ spin_unlock(&lli->lli_lock);
+ }
result = d_obtain_alias(inode);
if (IS_ERR(result))
struct dentry *child)
{
struct inode *dir = dentry->d_inode;
- struct file *filp;
struct ll_getname_data lgd;
+ __u64 offset = 0;
int rc;
ENTRY;
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);
- cfs_mutex_unlock(&dir->i_mutex);
+ mutex_lock(&dir->i_mutex);
+ rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir);
+ mutex_unlock(&dir->i_mutex);
if (!rc && !lgd.lgd_found)
rc = -ENOENT;
EXIT;
-out_close:
- fput(filp);
out:
return rc;
}