[PATCH 12/12] staging: lustre: llite: fixup return value ll_direct_IO_26

2016-04-27 Thread James Simmons
From: Dmitry Eremin 

Return the correct values from ll_direct_IO_26.

Signed-off-by: Dmitry Eremin 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4069
Reviewed-on: http://review.whamcloud.com/8080
Reviewed-by: John L. Hammond 
Reviewed-by: James Simmons 
Reviewed-by: Oleg Drokin 
Signed-Off-by: James Simmons 
---
 drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c 
b/drivers/staging/lustre/lustre/llite/rw26.c
index a740c7a..9341189 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -446,7 +446,7 @@ out:
}
 
cl_env_put(env, );
-   return tot_bytes ? : result;
+   return tot_bytes ? tot_bytes : result;
 }
 
 /**
-- 
2.7.4



[PATCH 12/12] staging: lustre: llite: fixup return value ll_direct_IO_26

2016-04-27 Thread James Simmons
From: Dmitry Eremin 

Return the correct values from ll_direct_IO_26.

Signed-off-by: Dmitry Eremin 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4069
Reviewed-on: http://review.whamcloud.com/8080
Reviewed-by: John L. Hammond 
Reviewed-by: James Simmons 
Reviewed-by: Oleg Drokin 
Signed-Off-by: James Simmons 
---
 drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c 
b/drivers/staging/lustre/lustre/llite/rw26.c
index a740c7a..9341189 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -446,7 +446,7 @@ out:
}
 
cl_env_put(env, );
-   return tot_bytes ? : result;
+   return tot_bytes ? tot_bytes : result;
 }
 
 /**
-- 
2.7.4