From 542edff1fb019457530aa864114fb9a272f2a711 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Mon, 3 Nov 2008 04:26:03 +0000
Subject: [PATCH] Branch b1_6 Quiet compiler warning about unused label.
Conditional check will be optimized away by compiler.
---
lustre/llite/symlink.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 8841385954..b90299dcac 100644
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -167,22 +167,16 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry, struct n
#endif
CDEBUG(D_VFSTRACE, "VFS Op\n");
-#if THREAD_SIZE < 8192
- /*
- * We set the limits recursive symlink to 5
- * instead of default 8 when kernel has 4k stack
- * to prevent stack overflow.
- */
- if (current->link_count >= 5) {
+ /* 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) {
rc = -ELOOP;
- GOTO(out_release, rc);
+ } else {
+ down(&lli->lli_size_sem);
+ rc = ll_readlink_internal(inode, &request, &symname);
+ up(&lli->lli_size_sem);
}
-#endif
- down(&lli->lli_size_sem);
- rc = ll_readlink_internal(inode, &request, &symname);
- up(&lli->lli_size_sem);
if (rc) {
-out_release:
path_release(nd); /* Kernel assumes that ->follow_link()
releases nameidata on error */
GOTO(out, rc);
--
GitLab