From 88c03eae2d0e69b71c885dd12c8ab7e50272ab55 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 12 Jul 2014 00:54:26 -0700
Subject: [PATCH] staging: lustre: cfs_time_sub() must return unsigned long

It looks like someone ment for it to return this value (there's a cast),
but the funtion says 'long' which causes problems when comparing values
from this function.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
index d686b55e406a..3371e9e0bb43 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
@@ -48,7 +48,7 @@ static inline unsigned long cfs_time_add(unsigned long t, long d)
 	return (unsigned long)(t + d);
 }
 
-static inline long cfs_time_sub(unsigned long t1, unsigned long t2)
+static inline unsigned long cfs_time_sub(unsigned long t1, unsigned long t2)
 {
 	return (unsigned long)(t1 - t2);
 }
-- 
2.34.1