[rds-devel] [PATCH] Trivial fix to adjust a code style

Jeff Liu jeff.liu at oracle.com
Sat Oct 8 08:16:10 PDT 2011


Hello,

s/else\nif/else if/, looks the original code style is caused by code merge?

Thanks,
-Jeff

Signed-off-by: Jie Liu <jeff.liu at oracle.com>

---
 net/rds/af_rds.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index bb6ad81..94536b2 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -331,11 +331,10 @@ static int rds_getsockopt(struct socket *sock, int level, int optname,
 	case RDS_RECVERR:
 		if (len < sizeof(int))
 			ret = -EINVAL;
-		else
-		if (put_user(rs->rs_recverr, (int __user *) optval) ||
-		    put_user(sizeof(int), optlen))
+		else if (put_user(rs->rs_recverr, (int __user *) optval) ||
+			 put_user(sizeof(int), optlen)) {
 			ret = -EFAULT;
-		else
+		} else
 			ret = 0;
 		break;
 	default:
-- 
1.7.4.1



More information about the rds-devel mailing list