diff --git a/lib/env_ocf/ocf_env.h b/lib/env_ocf/ocf_env.h
index 1bb4f16c8..cfd7a0fdc 100644
--- a/lib/env_ocf/ocf_env.h
+++ b/lib/env_ocf/ocf_env.h
@@ -525,28 +525,28 @@ env_atomic64_dec(env_atomic64 *a)
 	atomic_dec(a);
 }
 
-static inline int
-env_atomic64_add_return(int i, env_atomic *a)
+static inline long
+env_atomic64_add_return(long i, env_atomic64 *a)
 {
 	return __sync_add_and_fetch(a, i);
 }
 
-static inline int
-env_atomic64_sub_return(int i, env_atomic *a)
+static inline long
+env_atomic64_sub_return(long i, env_atomic64 *a)
 {
 	return __sync_sub_and_fetch(a, i);
 }
 
-static inline int
-env_atomic64_inc_return(env_atomic *a)
+static inline long
+env_atomic64_inc_return(env_atomic64 *a)
 {
 	return env_atomic64_add_return(1, a);
 }
 
-static inline int
-env_atomic64_dec_return(env_atomic *a)
+static inline long
+env_atomic64_dec_return(env_atomic64 *a)
 {
-	return env_atomic_sub_return(1, a);
+	return env_atomic64_sub_return(1, a);
 }
 
 static inline long