Add git rev to /proc/flashcache_version and to the usage() printed ou…

…t by

the flashcache utils.
Patch contributed by Krzysztof Blaszkowski.

Makefile

@@ -1,8 +1,13 @@
+
+COMMIT_REV := $(shell git describe  --always --abbrev=12)
+KERNEL_TREE ?= /lib/modules/$(shell uname -r)/build
+export COMMIT_REV
+
 all:
-	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(PWD)/src
+	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(shell pwd)/src all
 
 install:
-	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(PWD)/src install
+	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(shell pwd)/src install
 
 clean:
-	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(PWD)/src clean
+	$(MAKE) -C src KERNEL_TREE=$(KERNEL_TREE) PWD=$(shell pwd)/src clean

src/Makefile

@@ -1,5 +1,5 @@
-EXTRA_CFLAGS=-I$(KERNEL_TREE)/drivers/md -I./
-UTILS_CFLAGS=-I./
+EXTRA_CFLAGS=-I$(KERNEL_TREE)/drivers/md -I./ -DCOMMIT_REV="\"$(COMMIT_REV)\""
+UTILS_CFLAGS=-I./ -DCOMMIT_REV="\"$(COMMIT_REV)\""
 
 KERNEL_TREE ?= /lib/modules/$(shell uname -r)/build
 
@@ -9,10 +9,11 @@ flashcache-objs := flashcache_conf.o flashcache_main.o flashcache_subr.o flashca
 KERNEL_SOURCE_VERSION ?= $(shell uname -r)
 
 all:
-	make -C $(KERNEL_TREE) M=$(PWD) modules
-	$(CC) $(UTILS_CFLAGS) -o utils/flashcache_create utils/flashcache_create.c
-	$(CC) $(UTILS_CFLAGS) -o utils/flashcache_destroy utils/flashcache_destroy.c
-	$(CC) $(UTILS_CFLAGS) -o utils/flashcache_load utils/flashcache_load.c
+	make -C $(KERNEL_TREE) M=$(PWD) modules V=0
+	@echo "building utils"
+	@$(CC) $(UTILS_CFLAGS) -o utils/flashcache_create utils/flashcache_create.c
+	@$(CC) $(UTILS_CFLAGS) -o utils/flashcache_destroy utils/flashcache_destroy.c
+	@$(CC) $(UTILS_CFLAGS) -o utils/flashcache_load utils/flashcache_load.c
 
 install: all
 	install -o root -g root -m 0755 -d /lib/modules/$(KERNEL_SOURCE_VERSION)/extra/flashcache/

src/flashcache_conf.c

@@ -2018,6 +2018,9 @@ static int
 flashcache_version_show(struct seq_file *seq, void *v)
 {
 	seq_printf(seq, "Flashcache Version : %s\n", flashcache_sw_version);
+#ifdef COMMIT_REV
+	seq_printf(seq, "git commit: %s\n", COMMIT_REV);
+#endif
 	return 0;
 }
 

src/utils/flashcache_create.c

@@ -44,6 +44,9 @@ usage(char *pname)
 	fprintf(stderr, "Usage: %s [-b block size] [ -s cache size] cachedev ssd_devname disk_devname\n", pname);
 	fprintf(stderr, "Usage : %s Default units for -b, -s are sectors, use k/m/g allowed\n",
 		pname);
+#ifdef COMMIT_REV
+	fprintf(stderr, "git commit: %s\n", COMMIT_REV);
+#endif
 	exit(1);
 }
 

src/utils/flashcache_destroy.c

@@ -44,6 +44,9 @@ void
 usage(char *pname)
 {
 	fprintf(stderr, "Usage: %s ssd_devname\n", pname);
+#ifdef COMMIT_REV
+	fprintf(stderr, "git commit: %s\n", COMMIT_REV);
+#endif
 	exit(1);
 }
 

src/utils/flashcache_load.c

@@ -46,6 +46,9 @@ void
 usage(char *pname)
 {
 	fprintf(stderr, "Usage: %s cachedev ssd_devname disk_devname\n", pname);
+#ifdef COMMIT_REV
+	fprintf(stderr, "git commit: %s\n", COMMIT_REV);
+#endif
 	exit(1);
 }