[DRBD-cvs] drbd by phil; Compiles on L26 now without warnings. [p...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbd_fs.c drbd_req-2.4.c 


Log Message:
Compiles on L26 now without warnings.
[patch by LGE]

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Makefile,v
retrieving revision 1.14.2.20
retrieving revision 1.14.2.21
diff -u -3 -r1.14.2.20 -r1.14.2.21
--- Makefile	4 Feb 2004 10:32:37 -0000	1.14.2.20
+++ Makefile	8 Feb 2004 19:53:19 -0000	1.14.2.21
@@ -78,6 +78,9 @@
   # called from command line in current directory
   DRBDSRC := $(shell pwd)
   export DRBDSRC
+
+  KDIR_Makefile_PATCHLEVEL = $(shell grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+
   # to be overridden on command line:
   PREFIX := /
   ifeq ($(wildcard ../build-for-uml),../build-for-uml)
@@ -90,27 +93,34 @@
 
   .PHONY: drbd.o default all greeting clean kbuild install dep
 
-  drbd.o: greeting dep kbuild
+  drbd.o: greeting kbuild
   default: drbd.o
   all:     drbd.o
 
   greeting:
 	@echo "" ;\
 	echo "    Calling toplevel makefile of kernel source tree, which I believe is in" ;\
-	echo "    KDIR=$(KDIR)" ;\
-	echo "    NOTE: please ignore warnings regarding overriding of SUBDIRS" ;\
-	echo ""
+	echo "    KDIR=$(KDIR)"
+  ifeq ($(KDIR_Makefile_PATCHLEVEL),6)
+	@echo "    NOTE: please ignore warnings regarding overriding of SUBDIRS"
+  endif
+	@echo ""
 
   kbuild:
 	@rm -f .kernelrelease*
 	$(MAKE) -C $(KDIR) SUBDIRS=$(DRBDSRC) $(ARCH_UM) modules
 	@mv .kernelrelease.new .kernelrelease
 
-  # obsolete in 2.6 ...
-  dep:
-	@echo "make dep ..."
-	@$(MAKE) -s -C $(KDIR) SUBDIRS=$(DRBDSRC) $(ARCH_UM) dep
+  ifneq ($(KDIR_Makefile_PATCHLEVEL),6)
+    # obsolete in 2.6 ...
+    dep:
+	@echo "tying to make dep ..."
+	@$(MAKE) -s -C $(KDIR) SUBDIRS=$(DRBDSRC) $(ARCH_UM) dep || \
+         echo "I'll ignore this error, but this can cause inconsistencies!"
 	@echo "done."
+
+    kbuild: dep
+  endif
 
   clean:
 	rm -f *.[oas] *.ko .*.cmd .*.d .*.tmp *.mod.c .*.flags .depend .kernelrelease
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.67
retrieving revision 1.28.2.68
diff -u -3 -r1.28.2.67 -r1.28.2.68
--- drbd_fs.c	8 Feb 2004 12:26:14 -0000	1.28.2.67
+++ drbd_fs.c	8 Feb 2004 19:53:19 -0000	1.28.2.68
@@ -77,7 +77,7 @@
 STATIC int do_determin_dev_size(struct Drbd_Conf* mdev);
 int drbd_determin_dev_size(struct Drbd_Conf* mdev)
 {
-	sector_t long pmdss; // previous meta data start sector
+	sector_t pmdss; // previous meta data start sector
 	int rv;
 
 	wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
@@ -167,8 +167,8 @@
 int drbd_ioctl_set_disk(struct Drbd_Conf *mdev,
 			struct ioctl_disk_config * arg)
 {
-	int err,i; // unused in 26 ?? cannot believe it ...
-	int minor;
+	NOT_IN_26(int err;) // unused in 26 ?? cannot believe it ...
+	int i,minor;
 	enum ret_codes retcode;
 	struct disk_config new_conf;
 	struct file *filp = 0;
@@ -315,11 +315,11 @@
 	request_queue_t * const q = mdev->rq_queue;
 	request_queue_t * const b = bdev->bd_disk->queue;
 
-	q->max_sectors = min_not_zero(PAGE_SIZE >> 9, b->max_sectors);
+	q->max_sectors = min_not_zero((unsigned short)(PAGE_SIZE >> 9), b->max_sectors);
 	q->max_phys_segments = 1;
 	q->max_hw_segments   = 1;
-	q->max_segment_size  = min(PAGE_SIZE,b->max_segment_size);
-	q->hardsect_size     = max(512,b->hardsect_size);
+	q->max_segment_size  = min((unsigned)PAGE_SIZE,b->max_segment_size);
+	q->hardsect_size     = max((unsigned short)512,b->hardsect_size);
 	q->seg_boundary_mask = b->seg_boundary_mask;
 	q->merge_bvec_fn     = drbd_merge_bvec_fn;
 	D_ASSERT(q->hardsect_size <= PAGE_SIZE); // or we are really screwed ;-)
@@ -386,6 +386,7 @@
 int drbd_ioctl_get_conf(struct Drbd_Conf *mdev, struct ioctl_get_config* arg)
 {
 	struct ioctl_get_config cn;
+	memset(&cn,0,sizeof(cn));
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	cn.lower_device_major = MAJOR(mdev->backing_bdev ?
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_req-2.4.c,v
retrieving revision 1.33.2.52
retrieving revision 1.33.2.53
diff -u -3 -r1.33.2.52 -r1.33.2.53
--- drbd_req-2.4.c	8 Feb 2004 12:26:14 -0000	1.33.2.52
+++ drbd_req-2.4.c	8 Feb 2004 19:53:19 -0000	1.33.2.53
@@ -155,7 +155,7 @@
 	max = (chunk_sectors - (sector & (chunk_sectors - 1))) << 9;
 	max = min(lo_max,max);
 	// if (max < 0) max = 0; /* bio_add cannot handle a negative return */
-	return min(PAGE_SIZE,max);
+	return min((int)PAGE_SIZE,max);
 }
 #endif