From: hongchao.zhang <Hongchao.Zhang@Sun.COM>
Date: Mon, 8 Mar 2010 10:15:12 +0000 (+0800)
Subject: b=22035 workaround patch
X-Git-Tag: v1_8_2_52~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b7c592bf0d02bc246c6922be68052dfd86de2e97;p=fs%2Flustre-release.git

b=22035 workaround patch

disable the per-thread data (current->journal_info)
containing the lock info during I/O to work around
the issue for short tem

i=hongchao.zhang@sun.com
---

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 8e314c3..526facf 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -1343,14 +1343,19 @@ static int index_in_window(unsigned long index, unsigned long point,
 
 struct ll_thread_data *ll_td_get()
 {
+#if 0
         struct ll_thread_data *ltd = current->journal_info;
 
         LASSERT(ltd == NULL || ltd->ltd_magic == LTD_MAGIC);
         return ltd;
+#else
+        return NULL;
+#endif
 }
 
 void ll_td_set(struct ll_thread_data *ltd)
 {
+#if 0
         if (ltd == NULL) {
                 ltd = current->journal_info;
                 LASSERT(ltd == NULL || ltd->ltd_magic == LTD_MAGIC);
@@ -1361,6 +1366,7 @@ void ll_td_set(struct ll_thread_data *ltd)
         LASSERT(current->journal_info == NULL);
         LASSERT(ltd->ltd_magic == LTD_MAGIC);
         current->journal_info = ltd;
+#endif
 }
 
 static struct ll_readahead_state *ll_ras_get(struct file *f)