[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lustre-cvs
Subject:    [Lustre-cvs] b_ad: lustre/include/linux lustre_lite.h lustre_mds.h
From:       Zach Brown <zab () users ! sourceforge ! net>
Date:       2003-05-31 20:37:26
[Download RAW message or body]

Update of /cvsroot/lustre/lustre/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv2397/include/linux

Modified Files:
      Tag: b_ad
	lustre_lite.h lustre_mds.h 
Log Message:
- have the noop _{get,save}_intent macros consume args to quiet warnings
- set it_iattr in mdc_get_rpc_lock so _put_ ups the sem.  mdc_close() stops
  deadlocking.


Index: lustre_lite.h
===================================================================
RCS file: /cvsroot/lustre/lustre/include/linux/lustre_lite.h,v
retrieving revision 1.69.2.13.2.6
retrieving revision 1.69.2.13.2.7
diff -u -w -b -B -p -r1.69.2.13.2.6 -r1.69.2.13.2.7
--- lustre_lite.h	29 May 2003 14:40:08 -0000	1.69.2.13.2.6
+++ lustre_lite.h	31 May 2003 20:37:23 -0000	1.69.2.13.2.7
@@ -313,8 +313,8 @@ do {                                    
         up(&ll_d2d(de)->lld_it_sem);                                           \
 } while(0)
 #else
-#define LL_SAVE_INTENT(de, it)  do { int a = 1; a; } while(0)
-#define LL_GET_INTENT(de, it)  do { int a = 1; a; } while(0)
+#define LL_SAVE_INTENT(de, it)  do { (void)de, (void)it; } while(0)
+#define LL_GET_INTENT(de, it)  do { (void)de, (void)it; } while(0)
 #endif
 
 #define LL_IT2STR(it) ((it) ? ldlm_it2str((it)->it_op) : "0")

Index: lustre_mds.h
===================================================================
RCS file: /cvsroot/lustre/lustre/include/linux/lustre_mds.h,v
retrieving revision 1.96.2.9.2.2
retrieving revision 1.96.2.9.2.3
diff -u -w -b -B -p -r1.96.2.9.2.2 -r1.96.2.9.2.3
--- lustre_mds.h	26 May 2003 22:49:08 -0000	1.96.2.9.2.2
+++ lustre_mds.h	31 May 2003 20:37:23 -0000	1.96.2.9.2.3
@@ -66,6 +66,7 @@ static inline void mdc_get_rpc_lock(stru
         down(&lck->rpcl_sem);
         if (it) { 
                 lck->rpcl_it = it;
+                it->it_iattr = (void *)1;
         }
 }
 



-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Lustre-cvs mailing list
Lustre-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lustre-cvs
[prev in list] [next in list] [prev in thread] [next in thread]