* lustre updates for recent portals HEAD changes

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

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 427f7f0..f913d8a 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -30,11 +30,12 @@
 #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;
@@ -47,11 +48,12 @@ static int ll_readlink_internal(struct inode *inode,
                 RETURN(0);
         }
 
-        ll_inode2fid(&fid, inode);
-        rc = mdc_getattr(&sbi->ll_mdc_conn, &fid,
-                         OBD_MD_LINKNAME, symlen, request);
+        ll_inode2id(&id, inode);
+        rc = md_getattr(sbi->ll_md_exp, &id, OBD_MD_LINKNAME, symlen,
+                        request);
         if (rc) {
-                CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
+                if (rc != -ENOENT)
+                        CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
                 RETURN(rc);
         }
 
@@ -127,11 +129,11 @@ static int ll_follow_link(struct dentry *dentry, struct nameidata *nd)
 
         if (it != NULL) {
                 int op = it->it_op;
-                int mode = it->it_mode;
+                int mode = it->it_create_mode;
 
                 ll_intent_release(it);
                 it->it_op = op;
-                it->it_mode = mode;
+                it->it_create_mode = mode;
         }
 
         CDEBUG(D_VFSTRACE, "VFS Op\n");
@@ -148,13 +150,13 @@ static int ll_follow_link(struct dentry *dentry, struct nameidata *nd)
 }
 
 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,
+        .setattr_raw    = ll_setattr_raw,
+        .follow_link    = ll_follow_link,
 #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_it     = ll_getattr
 #endif
 };