X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fllite_nfs.c;h=3a0ffef54b9c6108483ab053079b6fc71a79b449;hp=1f1833759849d7344530eead98e9d2553e183a37;hb=9fb46705ae86aa2c0ac29427f0ff24f923560eb7;hpb=637b7bca5e06c27a402fc4b4c51bb833e3b8a785 diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c index 1f18337..3a0ffef 100644 --- a/lustre/llite/llite_nfs.c +++ b/lustre/llite/llite_nfs.c @@ -145,13 +145,13 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren * We have to find the parent to tell MDS how to init lov objects. */ if (S_ISREG(inode->i_mode) && !ll_i2info(inode)->lli_has_smd && - parent != NULL) { - struct ll_inode_info *lli = ll_i2info(inode); + 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)) @@ -232,9 +232,9 @@ static int ll_get_name(struct dentry *dentry, char *name, lgd.lgd_fid = ll_i2info(child->d_inode)->lli_fid; lgd.lgd_found = 0; - cfs_mutex_lock(&dir->i_mutex); + mutex_lock(&dir->i_mutex); rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir); - cfs_mutex_unlock(&dir->i_mutex); + mutex_unlock(&dir->i_mutex); if (!rc && !lgd.lgd_found) rc = -ENOENT; EXIT;