LU-1095 debug: no console message for long symlink

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

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index af46369..9a59011 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -56,14 +56,24 @@ static int ll_readlink_internal(struct inode *inode,
 
         *request = NULL;
 
-        if (lli->lli_symlink_name) {
-                *symname = lli->lli_symlink_name;
-                CDEBUG(D_INODE, "using cached symlink %s\n", *symname);
-                RETURN(0);
-        }
+       if (lli->lli_symlink_name) {
+               int print_limit = min_t(int, PAGE_SIZE - 128, symlen);
+
+               *symname = lli->lli_symlink_name;
+               /* If the total CDEBUG() size is larger than a page, it
+                * will print a warning to the console, avoid this by
+                * printing just the last part of the symlink. */
+               CDEBUG(D_INODE, "using cached symlink %s%.*s, len = %d\n",
+                      print_limit < symlen ? "..." : "", print_limit,
+                      (*symname) + symlen - print_limit, symlen);
+               RETURN(0);
+       }
 
         op_data = ll_prep_md_op_data(NULL, inode, NULL, NULL, 0, symlen,
                                      LUSTRE_OPC_ANY, NULL);
+        if (IS_ERR(op_data))
+                RETURN(PTR_ERR(op_data));
+
         op_data->op_valid = OBD_MD_LINKNAME;
         rc = md_getattr(sbi->ll_md_exp, op_data, request);
         ll_finish_md_op_data(op_data);
@@ -117,7 +127,7 @@ static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
         ENTRY;
 
         CDEBUG(D_VFSTRACE, "VFS Op\n");
-        /* on symlinks lli_open_sem protects lli_symlink_name allocation/data */
+
         ll_inode_size_lock(inode, 0);
         rc = ll_readlink_internal(inode, &request, &symname);
         if (rc)