diff options
author | Andy Grover <andy.grover@oracle.com> | 2010-01-12 14:56:44 -0500 |
---|---|---|
committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 21:11:32 -0400 |
commit | 8690bfa17aea4c42da1bcf90a7af93d161eca624 (patch) | |
tree | 88c4c5fa63aab0c18cf13228c4b3a6f980aa74be /net/rds/info.c | |
parent | 2dc393573430f853e56e25bf4b41c34ba2aa8fd6 (diff) |
RDS: cleanup: remove "== NULL"s and "!= NULL"s in ptr comparisons
Favor "if (foo)" style over "if (foo != NULL)".
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net/rds/info.c')
-rw-r--r-- | net/rds/info.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rds/info.c b/net/rds/info.c index c45c4173a44d..4fdf1b6e84ff 100644 --- a/net/rds/info.c +++ b/net/rds/info.c | |||
@@ -76,7 +76,7 @@ void rds_info_register_func(int optname, rds_info_func func) | |||
76 | BUG_ON(optname < RDS_INFO_FIRST || optname > RDS_INFO_LAST); | 76 | BUG_ON(optname < RDS_INFO_FIRST || optname > RDS_INFO_LAST); |
77 | 77 | ||
78 | spin_lock(&rds_info_lock); | 78 | spin_lock(&rds_info_lock); |
79 | BUG_ON(rds_info_funcs[offset] != NULL); | 79 | BUG_ON(rds_info_funcs[offset]); |
80 | rds_info_funcs[offset] = func; | 80 | rds_info_funcs[offset] = func; |
81 | spin_unlock(&rds_info_lock); | 81 | spin_unlock(&rds_info_lock); |
82 | } | 82 | } |
@@ -102,7 +102,7 @@ EXPORT_SYMBOL_GPL(rds_info_deregister_func); | |||
102 | */ | 102 | */ |
103 | void rds_info_iter_unmap(struct rds_info_iterator *iter) | 103 | void rds_info_iter_unmap(struct rds_info_iterator *iter) |
104 | { | 104 | { |
105 | if (iter->addr != NULL) { | 105 | if (iter->addr) { |
106 | kunmap_atomic(iter->addr, KM_USER0); | 106 | kunmap_atomic(iter->addr, KM_USER0); |
107 | iter->addr = NULL; | 107 | iter->addr = NULL; |
108 | } | 108 | } |
@@ -117,7 +117,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data, | |||
117 | unsigned long this; | 117 | unsigned long this; |
118 | 118 | ||
119 | while (bytes) { | 119 | while (bytes) { |
120 | if (iter->addr == NULL) | 120 | if (!iter->addr) |
121 | iter->addr = kmap_atomic(*iter->pages, KM_USER0); | 121 | iter->addr = kmap_atomic(*iter->pages, KM_USER0); |
122 | 122 | ||
123 | this = min(bytes, PAGE_SIZE - iter->offset); | 123 | this = min(bytes, PAGE_SIZE - iter->offset); |
@@ -188,7 +188,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, | |||
188 | >> PAGE_SHIFT; | 188 | >> PAGE_SHIFT; |
189 | 189 | ||
190 | pages = kmalloc(nr_pages * sizeof(struct page *), GFP_KERNEL); | 190 | pages = kmalloc(nr_pages * sizeof(struct page *), GFP_KERNEL); |
191 | if (pages == NULL) { | 191 | if (!pages) { |
192 | ret = -ENOMEM; | 192 | ret = -ENOMEM; |
193 | goto out; | 193 | goto out; |
194 | } | 194 | } |
@@ -206,7 +206,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, | |||
206 | 206 | ||
207 | call_func: | 207 | call_func: |
208 | func = rds_info_funcs[optname - RDS_INFO_FIRST]; | 208 | func = rds_info_funcs[optname - RDS_INFO_FIRST]; |
209 | if (func == NULL) { | 209 | if (!func) { |
210 | ret = -ENOPROTOOPT; | 210 | ret = -ENOPROTOOPT; |
211 | goto out; | 211 | goto out; |
212 | } | 212 | } |
@@ -234,7 +234,7 @@ call_func: | |||
234 | ret = -EFAULT; | 234 | ret = -EFAULT; |
235 | 235 | ||
236 | out: | 236 | out: |
237 | for (i = 0; pages != NULL && i < nr_pages; i++) | 237 | for (i = 0; pages && i < nr_pages; i++) |
238 | put_page(pages[i]); | 238 | put_page(pages[i]); |
239 | kfree(pages); | 239 | kfree(pages); |
240 | 240 | ||