[DRBD-cvs] svn commit by phil - r2118 - in trunk: . drbd drbd/linux - Latest fixes from the 0.7 branch.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-03-14 10:17:56 +0100 (Tue, 14 Mar 2006)
New Revision: 2118

Modified:
   trunk/
   trunk/Makefile
   trunk/drbd/drbd_actlog.c
   trunk/drbd/drbd_receiver.c
   trunk/drbd/linux/drbd_config.h
Log:
Latest fixes from the 0.7 branch.



Property changes on: trunk
___________________________________________________________________
Name: propagate:at
   - 2097
   + 2117

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-03-13 17:38:25 UTC (rev 2117)
+++ trunk/Makefile	2006-03-14 09:17:56 UTC (rev 2118)
@@ -188,7 +188,7 @@
 	       -e "s/^\(Packager:\).*/\1 $(USER)@$(HOSTNAME)/;" < drbd.spec.in \
 	   > dist/SPECS/drbd.spec ; \
 	fi
-	$(RPMBUILD) -ba \
+	$(RPMBUILD) -bb \
 	    --define "_topdir $(PWD)/dist" \
 	    --define "buildroot $(PWD)/dist/install" \
 	    --define "kernelversion $(KVER)" \

Modified: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c	2006-03-13 17:38:25 UTC (rev 2117)
+++ trunk/drbd/drbd_actlog.c	2006-03-14 09:17:56 UTC (rev 2118)
@@ -38,7 +38,7 @@
 				 struct page *page, sector_t sector, 
 				 int rw, int size)
 {
-	struct bio *bio = bio_alloc(GFP_KERNEL, 1);
+	struct bio *bio = bio_alloc(GFP_NOIO, 1);
 	struct completion event;
 	int ok;
 

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2006-03-13 17:38:25 UTC (rev 2117)
+++ trunk/drbd/drbd_receiver.c	2006-03-14 09:17:56 UTC (rev 2118)
@@ -53,7 +53,7 @@
 #include "drbd_int.h"
 
 #if defined(__arch_um__) && !defined(HAVE_UML_TO_VIRT)
-void *to_virt(unsigned long phys)
+static inline void *to_virt(unsigned long phys)
 {
 	return((void *) uml_physmem + phys);
 }

Modified: trunk/drbd/linux/drbd_config.h
===================================================================
--- trunk/drbd/linux/drbd_config.h	2006-03-13 17:38:25 UTC (rev 2117)
+++ trunk/drbd/linux/drbd_config.h	2006-03-14 09:17:56 UTC (rev 2118)
@@ -47,4 +47,8 @@
 // for troubles.
 // #define DRBD_DISABLE_SENDPAGE
 
+// older, unpached kernel sources do not have it, so we added it in drbd_receiver.c
+// but more recent kernels define it in arch/um/include/mem.h
+#define HAVE_UML_TO_VIRT
+
 #endif