#include "llite_internal.h"
static int ll_readlink_internal(struct inode *inode,
- struct ptlrpc_request **request, char **symname)
+ struct ptlrpc_request **request,
+ char **symname)
{
struct ll_inode_info *lli = ll_i2info(inode);
struct ll_sb_info *sbi = ll_i2sbi(inode);
- struct ll_fid fid;
+ struct lustre_id id;
struct mds_body *body;
int rc, symlen = inode->i_size + 1;
ENTRY;
RETURN(0);
}
- ll_inode2fid(&fid, inode);
- rc = md_getattr(sbi->ll_mdc_exp, &fid,
- OBD_MD_LINKNAME, symlen, request);
+ ll_inode2id(&id, inode);
+ rc = md_getattr(sbi->ll_md_exp, &id, OBD_MD_LINKNAME, NULL, NULL, 0,
+ symlen, NULL, request);
+
if (rc) {
- CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
- RETURN(rc);
+ if (rc != -ENOENT)
+ CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
+ GOTO(failed, rc);
}
body = lustre_msg_buf ((*request)->rq_repmsg, 0, sizeof (*body));
failed:
ptlrpc_req_finished (*request);
- RETURN (-EPROTO);
+ RETURN(rc);
}
static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
down(&lli->lli_open_sem);
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_open_sem);
- if (rc)
+ if (rc) {
+ path_release(nd); /* Kernel assumes that ->follow_link()
+ releases nameidata on error */
GOTO(out, rc);
+ }
rc = vfs_follow_link(nd, symname);
ptlrpc_req_finished(request);
}
struct inode_operations ll_fast_symlink_inode_operations = {
- readlink: ll_readlink,
- setattr: ll_setattr,
- setattr_raw: ll_setattr_raw,
- follow_link: ll_follow_link,
+ .readlink = ll_readlink,
+ .setattr = ll_setattr,
+ .follow_link = ll_follow_link,
+ .setxattr = ll_setxattr,
+ .getxattr = ll_getxattr,
+ .listxattr = ll_listxattr,
+ .removexattr = ll_removexattr,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
- revalidate_it: ll_inode_revalidate_it
+ .revalidate_it = ll_inode_revalidate_it
#else
- getattr_it: ll_getattr
+ .getattr = ll_getattr
#endif
};