diff options
Diffstat (limited to 'fs/ceph/mdsmap.c')
| -rw-r--r-- | fs/ceph/mdsmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c index 1a748cf88535..33ced4c22732 100644 --- a/fs/ceph/mdsmap.c +++ b/fs/ceph/mdsmap.c | |||
| @@ -112,7 +112,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) | |||
| 112 | u16 mdsmap_ev; | 112 | u16 mdsmap_ev; |
| 113 | 113 | ||
| 114 | m = kzalloc(sizeof(*m), GFP_NOFS); | 114 | m = kzalloc(sizeof(*m), GFP_NOFS); |
| 115 | if (m == NULL) | 115 | if (!m) |
| 116 | return ERR_PTR(-ENOMEM); | 116 | return ERR_PTR(-ENOMEM); |
| 117 | 117 | ||
| 118 | ceph_decode_need(p, end, 1 + 1, bad); | 118 | ceph_decode_need(p, end, 1 + 1, bad); |
| @@ -138,7 +138,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) | |||
| 138 | m->m_num_mds = m->m_max_mds; | 138 | m->m_num_mds = m->m_max_mds; |
| 139 | 139 | ||
| 140 | m->m_info = kcalloc(m->m_num_mds, sizeof(*m->m_info), GFP_NOFS); | 140 | m->m_info = kcalloc(m->m_num_mds, sizeof(*m->m_info), GFP_NOFS); |
| 141 | if (m->m_info == NULL) | 141 | if (!m->m_info) |
| 142 | goto nomem; | 142 | goto nomem; |
| 143 | 143 | ||
| 144 | /* pick out active nodes from mds_info (state > 0) */ | 144 | /* pick out active nodes from mds_info (state > 0) */ |
| @@ -232,7 +232,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) | |||
| 232 | if (num_export_targets) { | 232 | if (num_export_targets) { |
| 233 | info->export_targets = kcalloc(num_export_targets, | 233 | info->export_targets = kcalloc(num_export_targets, |
| 234 | sizeof(u32), GFP_NOFS); | 234 | sizeof(u32), GFP_NOFS); |
| 235 | if (info->export_targets == NULL) | 235 | if (!info->export_targets) |
| 236 | goto nomem; | 236 | goto nomem; |
| 237 | for (j = 0; j < num_export_targets; j++) | 237 | for (j = 0; j < num_export_targets; j++) |
| 238 | info->export_targets[j] = | 238 | info->export_targets[j] = |
