summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-12 00:54:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-12 00:54:26 -0700
commit88c03eae2d0e69b71c885dd12c8ab7e50272ab55 (patch)
treea6749cd367276e8d45bf90dea0d061a85a63cf9c
parentb2d201bd169a60b7c75649dafc2180be5dc12fa0 (diff)
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>
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/libcfs_time.h2
1 files changed, 1 insertions, 1 deletions
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);
}