#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "llite_internal.h"
-#ifdef HAVE_LINUX_EXPORTFS_H
#include <linux/exportfs.h>
-#endif
__u32 get_uuid2int(const char *name, int len)
{
rc = md_getattr(sbi->ll_md_exp, op_data, &req);
OBD_FREE_PTR(op_data);
if (rc) {
- CERROR("can't get object attrs, fid "DFID", rc %d\n",
- PFID(fid), rc);
+ /* Suppress erroneous/confusing messages when NFS
+ * is out of sync and requests old data. */
+ CDEBUG(D_INFO, "can't get object attrs, fid "DFID", rc %d\n",
+ PFID(fid), rc);
RETURN(ERR_PTR(rc));
}
rc = ll_prep_inode(&inode, req, sb, NULL);
struct dentry *result;
ENTRY;
- CDEBUG(D_INFO, "Get dentry for fid: "DFID"\n", PFID(fid));
if (!fid_is_sane(fid))
RETURN(ERR_PTR(-ESTALE));
+ CDEBUG(D_INFO, "Get dentry for fid: "DFID"\n", PFID(fid));
+
inode = search_inode_for_lustre(sb, fid);
if (IS_ERR(inode))
RETURN(ERR_PTR(PTR_ERR(inode)));
* 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) {
+ parent != NULL && !fid_is_zero(parent)) {
struct ll_inode_info *lli = ll_i2info(inode);
spin_lock(&lli->lli_lock);
spin_unlock(&lli->lli_lock);
}
- result = d_obtain_alias(inode);
- if (IS_ERR(result))
- RETURN(result);
-
- ll_dops_init(result, 1, 0);
+ result = d_obtain_alias(inode);
+ if (IS_ERR(result)) {
+ iput(inode);
+ RETURN(result);
+ }
RETURN(result);
}
-#define LUSTRE_NFS_FID 0x97
+#ifndef FILEID_INVALID
+#define FILEID_INVALID 0xff
+#endif
+#ifndef FILEID_LUSTRE
+#define FILEID_LUSTRE 0x97
+#endif
/**
* \a connectable - is nfsd will connect himself or this should be done
struct inode *parent)
{
#endif
+ int fileid_len = sizeof(struct lustre_nfs_fid) / 4;
struct lustre_nfs_fid *nfs_fid = (void *)fh;
ENTRY;
- CDEBUG(D_INFO, "encoding for (%lu,"DFID") maxlen=%d minlen=%d\n",
- inode->i_ino, PFID(ll_inode2fid(inode)), *plen,
- (int)sizeof(struct lustre_nfs_fid));
+ CDEBUG(D_INFO, "%s: encoding for ("DFID") maxlen=%d minlen=%d\n",
+ ll_get_fsname(inode->i_sb, NULL, 0),
+ PFID(ll_inode2fid(inode)), *plen, fileid_len);
- if (*plen < sizeof(struct lustre_nfs_fid) / 4)
- RETURN(255);
+ if (*plen < fileid_len) {
+ *plen = fileid_len;
+ RETURN(FILEID_INVALID);
+ }
nfs_fid->lnf_child = *ll_inode2fid(inode);
- nfs_fid->lnf_parent = *ll_inode2fid(parent);
- *plen = sizeof(struct lustre_nfs_fid) / 4;
+ if (parent != NULL)
+ nfs_fid->lnf_parent = *ll_inode2fid(parent);
+ else
+ fid_zero(&nfs_fid->lnf_parent);
+ *plen = fileid_len;
- RETURN(LUSTRE_NFS_FID);
+ RETURN(FILEID_LUSTRE);
}
static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
return rc;
}
-#ifdef HAVE_FH_TO_DENTRY
static struct dentry *ll_fh_to_dentry(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type)
{
struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
- if (fh_type != LUSTRE_NFS_FID)
- RETURN(ERR_PTR(-EPROTO));
+ if (fh_type != FILEID_LUSTRE)
+ RETURN(ERR_PTR(-EPROTO));
RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_child, &nfs_fid->lnf_parent));
}
{
struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
- if (fh_type != LUSTRE_NFS_FID)
- RETURN(ERR_PTR(-EPROTO));
+ if (fh_type != FILEID_LUSTRE)
+ RETURN(ERR_PTR(-EPROTO));
RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_parent, NULL));
}
-#else
-
-/*
- * This length is counted as amount of __u32,
- * It is composed of a fid and a mode
- */
-static struct dentry *ll_decode_fh(struct super_block *sb, __u32 *fh, int fh_len,
- int fh_type,
- int (*acceptable)(void *, struct dentry *),
- void *context)
-{
- struct lustre_nfs_fid *nfs_fid = (void *)fh;
- struct dentry *entry;
- ENTRY;
-
- CDEBUG(D_INFO, "decoding for "DFID" fh_len=%d fh_type=%x\n",
- PFID(&nfs_fid->lnf_child), fh_len, fh_type);
-
- if (fh_type != LUSTRE_NFS_FID)
- RETURN(ERR_PTR(-EPROTO));
-
- entry = sb->s_export_op->find_exported_dentry(sb, &nfs_fid->lnf_child,
- &nfs_fid->lnf_parent,
- acceptable, context);
- RETURN(entry);
-}
-
-static struct dentry *ll_get_dentry(struct super_block *sb, void *data)
-{
- struct dentry *entry;
- ENTRY;
-
- entry = ll_iget_for_nfs(sb, data, NULL);
- RETURN(entry);
-}
-#endif
static struct dentry *ll_get_parent(struct dentry *dchild)
{
struct ptlrpc_request *req = NULL;
sbi = ll_s2sbi(dir->i_sb);
- CDEBUG(D_INFO, "getting parent for (%lu,"DFID")\n",
- dir->i_ino, PFID(ll_inode2fid(dir)));
+ CDEBUG(D_INFO, "%s: getting parent for ("DFID")\n",
+ ll_get_fsname(dir->i_sb, NULL, 0),
+ PFID(ll_inode2fid(dir)));
rc = ll_get_max_mdsize(sbi, &lmmsize);
if (rc != 0)
rc = md_getattr_name(sbi->ll_md_exp, op_data, &req);
ll_finish_md_op_data(op_data);
if (rc) {
- CERROR("failure %d inode %lu get parent\n", rc, dir->i_ino);
+ CERROR("%s: failure inode "DFID" get parent: rc = %d\n",
+ ll_get_fsname(dir->i_sb, NULL, 0),
+ PFID(ll_inode2fid(dir)), rc);
RETURN(ERR_PTR(rc));
}
body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
.get_parent = ll_get_parent,
.encode_fh = ll_encode_fh,
.get_name = ll_get_name,
-#ifdef HAVE_FH_TO_DENTRY
.fh_to_dentry = ll_fh_to_dentry,
.fh_to_parent = ll_fh_to_parent,
-#else
- .get_dentry = ll_get_dentry,
- .decode_fh = ll_decode_fh,
-#endif
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff