- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

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

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index d522485..19d234e 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -23,6 +23,10 @@
 #include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/smp_lock.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+#include <asm/statfs.h>
+#endif
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <linux/lustre_lite.h>
@@ -32,34 +36,62 @@ static int ll_readlink_internal(struct inode *inode,
 {
         struct ll_inode_info *lli = ll_i2info(inode);
         struct ll_sb_info *sbi = ll_i2sbi(inode);
-        int rc, len = inode->i_size + 1;
+        struct ll_fid fid;
+        struct mds_body *body;
+        int rc, symlen = inode->i_size + 1;
         ENTRY;
 
         *request = NULL;
 
-        CHECK_MOUNT_EPOCH(inode);
-
         if (lli->lli_symlink_name) {
                 *symname = lli->lli_symlink_name;
                 CDEBUG(D_INODE, "using cached symlink %s\n", *symname);
                 RETURN(0);
         }
 
-        rc = mdc_getattr(&sbi->ll_mdc_conn, inode->i_ino, S_IFLNK,
-                         OBD_MD_LINKNAME, len, request);
+        ll_inode2fid(&fid, inode);
+        rc = mdc_getattr(&sbi->ll_mdc_conn, &fid,
+                         OBD_MD_LINKNAME, symlen, request);
         if (rc) {
-                CERROR("inode "LPD64": rc = %d\n", inode->i_ino, rc);
+                CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
                 RETURN(rc);
         }
 
-        *symname = lustre_msg_buf((*request)->rq_repmsg, 1);
+        body = lustre_msg_buf ((*request)->rq_repmsg, 0, sizeof (*body));
+        LASSERT (body != NULL);
+        LASSERT_REPSWABBED (*request, 0);
+
+        if ((body->valid & OBD_MD_LINKNAME) == 0) {
+                CERROR ("OBD_MD_LINKNAME not set on reply\n");
+                GOTO (failed, rc = -EPROTO);
+        }
+        
+        LASSERT (symlen != 0);
+        if (body->eadatasize != symlen) {
+                CERROR ("inode %lu: symlink length %d not expected %d\n",
+                        inode->i_ino, body->eadatasize - 1, symlen - 1);
+                GOTO (failed, rc = -EPROTO);
+        }
+
+        *symname = lustre_msg_buf ((*request)->rq_repmsg, 1, symlen);
+        if (*symname == NULL ||
+            strnlen (*symname, symlen) != symlen - 1) {
+                /* not full/NULL terminated */
+                CERROR ("inode %lu: symlink not NULL terminated string"
+                        "of length %d\n", inode->i_ino, symlen - 1);
+                GOTO (failed, rc = -EPROTO);
+        }
 
-        OBD_ALLOC(lli->lli_symlink_name, len);
+        OBD_ALLOC(lli->lli_symlink_name, symlen);
         /* do not return an error if we cannot cache the symlink locally */
         if (lli->lli_symlink_name)
-                memcpy(lli->lli_symlink_name, *symname, len);
+                memcpy(lli->lli_symlink_name, *symname, symlen);
 
         RETURN(0);
+
+ failed:
+        ptlrpc_req_finished (*request);
+        RETURN (-EPROTO);
 }
 
 static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
@@ -71,8 +103,7 @@ static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
         int rc;
         ENTRY;
 
-        CHECK_MOUNT_EPOCH(inode);
-
+        CDEBUG(D_VFSTRACE, "VFS Op\n");
         /* on symlinks lli_open_sem protects lli_symlink_name allocation/data */
         down(&lli->lli_open_sem);
         rc = ll_readlink_internal(inode, &request, &symname);
@@ -80,40 +111,88 @@ static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
                 GOTO(out, rc);
 
         rc = vfs_readlink(dentry, buffer, buflen, symname);
+        ptlrpc_req_finished(request);
  out:
         up(&lli->lli_open_sem);
-        ptlrpc_req_finished(request);
-
         RETURN(rc);
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+static int ll_follow_link(struct dentry *dentry, struct nameidata *nd,
+                          struct lookup_intent *it)
+{
+        struct inode *inode = dentry->d_inode;
+        struct ll_inode_info *lli = ll_i2info(inode);
+        struct ptlrpc_request *request;
+        int op = 0, mode = 0, rc;
+        char *symname;
+        ENTRY;
+
+        CDEBUG(D_VFSTRACE, "VFS Op\n");
+        if (it != NULL) {
+                op = it->it_op;
+                mode = it->it_mode;
+
+                ll_intent_release(dentry, it);
+        }
+
+        down(&lli->lli_open_sem);
+        rc = ll_readlink_internal(inode, &request, &symname);
+        up(&lli->lli_open_sem);
+        if (rc)
+                GOTO(out, rc);
+
+        if (it != NULL) {
+                it->it_op = op;
+                it->it_mode = mode;
+        }
+
+        rc = vfs_follow_link_it(nd, symname, it);
+        ptlrpc_req_finished(request);
+ out:
+        RETURN(rc);
+}
+#else
 static int ll_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
         struct inode *inode = dentry->d_inode;
         struct ll_inode_info *lli = ll_i2info(inode);
         struct ptlrpc_request *request;
+        int op = 0, mode = 0, rc;
         char *symname;
-        int rc;
         ENTRY;
 
-        CHECK_MOUNT_EPOCH(inode);
+        op = nd->it.it_op;
+        mode = nd->it.it_mode;
+
+        ll_intent_release(dentry, &nd->it);
 
         down(&lli->lli_open_sem);
+
         rc = ll_readlink_internal(inode, &request, &symname);
         if (rc)
                 GOTO(out, rc);
 
-       rc = vfs_follow_link(nd, symname);
+        nd->it.it_op = op;
+        nd->it.it_mode = mode;
+
+        rc = vfs_follow_link(nd, symname);
+        ptlrpc_req_finished(request);
  out:
         up(&lli->lli_open_sem);
-        ptlrpc_req_finished(request);
 
         RETURN(rc);
 }
+#endif
 
+extern int ll_inode_revalidate(struct dentry *dentry);
 extern int ll_setattr(struct dentry *de, struct iattr *attr);
 struct inode_operations ll_fast_symlink_inode_operations = {
         readlink:       ll_readlink,
         setattr:        ll_setattr,
-        follow_link:    ll_follow_link
+        setattr_raw:    ll_setattr_raw,
+        follow_link2:   ll_follow_link,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+        revalidate:     ll_inode_revalidate
+#endif
 };