LU-451 Workaround for lockd (nfsv3) locking

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

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index ff1c99a..af46369 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -51,7 +51,7 @@ static int ll_readlink_internal(struct inode *inode,
         struct ll_sb_info *sbi = ll_i2sbi(inode);
         int rc, symlen = i_size_read(inode) + 1;
         struct mdt_body *body;
-        struct obd_capa *oc;
+        struct md_op_data *op_data;
         ENTRY;
 
         *request = NULL;
@@ -62,10 +62,11 @@ static int ll_readlink_internal(struct inode *inode,
                 RETURN(0);
         }
 
-        oc = ll_mdscapa_get(inode);
-        rc = md_getattr(sbi->ll_md_exp, ll_inode2fid(inode), oc,
-                        OBD_MD_LINKNAME, symlen, request);
-        capa_put(oc);
+        op_data = ll_prep_md_op_data(NULL, inode, NULL, NULL, 0, symlen,
+                                     LUSTRE_OPC_ANY, NULL);
+        op_data->op_valid = OBD_MD_LINKNAME;
+        rc = md_getattr(sbi->ll_md_exp, op_data, request);
+        ll_finish_md_op_data(op_data);
         if (rc) {
                 if (rc != -ENOENT)
                         CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
@@ -99,15 +100,11 @@ static int ll_readlink_internal(struct inode *inode,
         /* do not return an error if we cannot cache the symlink locally */
         if (lli->lli_symlink_name) {
                 memcpy(lli->lli_symlink_name, *symname, symlen);
-                ptlrpc_req_finished (*request);
-                *request = NULL;
                 *symname = lli->lli_symlink_name;
         }
-
         RETURN(0);
 
- failed:
-        ptlrpc_req_finished (*request);
+failed:
         RETURN (rc);
 }
 
@@ -127,8 +124,8 @@ 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:
+        ptlrpc_req_finished(request);
         ll_inode_size_unlock(inode, 0);
         RETURN(rc);
 }
@@ -143,29 +140,18 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry,
                                                  struct nameidata *nd)
 {
         struct inode *inode = dentry->d_inode;
-#ifdef HAVE_VFS_INTENT_PATCHES
-        struct lookup_intent *it = ll_nd2it(nd);
-#endif
         struct ptlrpc_request *request = NULL;
         int rc;
         char *symname;
         ENTRY;
 
-#ifdef HAVE_VFS_INTENT_PATCHES
-        if (it != NULL) {
-                int op = it->it_op;
-                int mode = it->it_create_mode;
-
-                ll_intent_release(it);
-                it->it_op = op;
-                it->it_create_mode = mode;
-        }
-#endif
-
         CDEBUG(D_VFSTRACE, "VFS Op\n");
         /* Limit the recursive symlink depth to 5 instead of default
-         * 8 links when kernel has 4k stack to prevent stack overflow. */
-        if (THREAD_SIZE < 8192 && current->link_count >= 5) {
+         * 8 links when kernel has 4k stack to prevent stack overflow.
+         * For 8k stacks we need to limit it to 7 for local servers. */
+        if (THREAD_SIZE < 8192 && current->link_count >= 6) {
+                rc = -ELOOP;
+        } else if (THREAD_SIZE == 8192 && current->link_count >= 8) {
                 rc = -ELOOP;
         } else {
                 ll_inode_size_lock(inode, 0);
@@ -173,30 +159,26 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry,
                 ll_inode_size_unlock(inode, 0);
         }
         if (rc) {
-                path_release(nd); /* Kernel assumes that ->follow_link()
+                cfs_path_put(nd); /* Kernel assumes that ->follow_link()
                                      releases nameidata on error */
                 GOTO(out, rc);
         }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8))
-        rc = vfs_follow_link(nd, symname);
-#else
 #ifdef HAVE_COOKIE_FOLLOW_LINK
         nd_set_link(nd, symname);
         /* @symname may contain a pointer to the request message buffer,
            we delay request releasing until ll_put_link then. */
         RETURN(request);
 #else
-        if (request != NULL) {
+        if (lli->lli_symlink_name == NULL) {
                 /* falling back to recursive follow link if the request
                  * needs to be cleaned up still. */
-        rc = vfs_follow_link(nd, symname);
+                rc = vfs_follow_link(nd, symname);
                 GOTO(out, rc);
         }
         nd_set_link(nd, symname);
         RETURN(0);
 #endif
-#endif
 out:
         ptlrpc_req_finished(request);
 #ifdef HAVE_COOKIE_FOLLOW_LINK
@@ -216,9 +198,6 @@ static void ll_put_link(struct dentry *dentry, struct nameidata *nd, void *cooki
 struct inode_operations ll_fast_symlink_inode_operations = {
         .readlink       = ll_readlink,
         .setattr        = ll_setattr,
-#ifdef HAVE_VFS_INTENT_PATCHES
-        .setattr_raw    = ll_setattr_raw,
-#endif
         .follow_link    = ll_follow_link,
 #ifdef HAVE_COOKIE_FOLLOW_LINK
         .put_link       = ll_put_link,