aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2007-08-29 09:36:22 -0400
committerRoland Dreier <rolandd@cisco.com>2007-10-09 22:59:05 -0400
commit8a68bbe31d51cc75d2acf1c9f5ceff91f7662ea4 (patch)
tree2238a4f1cc3dba0b61e5bec2c4fca20ba27317c6 /drivers
parent1fea391039d1c4e876a164099bff475a02a29d96 (diff)
IB/fmr_pool: Clean up some error messages in fmr_pool.c
A number of printks in fmr_pool.c dont have newlines, eg: fmr_create failed for FMR 0<5>FS-Cache: Loaded Fix them up. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/core/fmr_pool.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index a06bcc65a871..d7f64525469b 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -152,7 +152,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
152 152
153#ifdef DEBUG 153#ifdef DEBUG
154 if (fmr->ref_count !=0) { 154 if (fmr->ref_count !=0) {
155 printk(KERN_WARNING PFX "Unmapping FMR 0x%08x with ref count %d", 155 printk(KERN_WARNING PFX "Unmapping FMR 0x%08x with ref count %d\n",
156 fmr, fmr->ref_count); 156 fmr, fmr->ref_count);
157 } 157 }
158#endif 158#endif
@@ -170,7 +170,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
170 170
171 ret = ib_unmap_fmr(&fmr_list); 171 ret = ib_unmap_fmr(&fmr_list);
172 if (ret) 172 if (ret)
173 printk(KERN_WARNING PFX "ib_unmap_fmr returned %d", ret); 173 printk(KERN_WARNING PFX "ib_unmap_fmr returned %d\n", ret);
174 174
175 spin_lock_irq(&pool->pool_lock); 175 spin_lock_irq(&pool->pool_lock);
176 list_splice(&unmap_list, &pool->free_list); 176 list_splice(&unmap_list, &pool->free_list);
@@ -235,13 +235,13 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
235 235
236 attr = kmalloc(sizeof *attr, GFP_KERNEL); 236 attr = kmalloc(sizeof *attr, GFP_KERNEL);
237 if (!attr) { 237 if (!attr) {
238 printk(KERN_WARNING PFX "couldn't allocate device attr struct"); 238 printk(KERN_WARNING PFX "couldn't allocate device attr struct\n");
239 return ERR_PTR(-ENOMEM); 239 return ERR_PTR(-ENOMEM);
240 } 240 }
241 241
242 ret = ib_query_device(device, attr); 242 ret = ib_query_device(device, attr);
243 if (ret) { 243 if (ret) {
244 printk(KERN_WARNING PFX "couldn't query device: %d", ret); 244 printk(KERN_WARNING PFX "couldn't query device: %d\n", ret);
245 kfree(attr); 245 kfree(attr);
246 return ERR_PTR(ret); 246 return ERR_PTR(ret);
247 } 247 }
@@ -255,7 +255,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
255 255
256 pool = kmalloc(sizeof *pool, GFP_KERNEL); 256 pool = kmalloc(sizeof *pool, GFP_KERNEL);
257 if (!pool) { 257 if (!pool) {
258 printk(KERN_WARNING PFX "couldn't allocate pool struct"); 258 printk(KERN_WARNING PFX "couldn't allocate pool struct\n");
259 return ERR_PTR(-ENOMEM); 259 return ERR_PTR(-ENOMEM);
260 } 260 }
261 261
@@ -272,7 +272,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
272 kmalloc(IB_FMR_HASH_SIZE * sizeof *pool->cache_bucket, 272 kmalloc(IB_FMR_HASH_SIZE * sizeof *pool->cache_bucket,
273 GFP_KERNEL); 273 GFP_KERNEL);
274 if (!pool->cache_bucket) { 274 if (!pool->cache_bucket) {
275 printk(KERN_WARNING PFX "Failed to allocate cache in pool"); 275 printk(KERN_WARNING PFX "Failed to allocate cache in pool\n");
276 ret = -ENOMEM; 276 ret = -ENOMEM;
277 goto out_free_pool; 277 goto out_free_pool;
278 } 278 }
@@ -296,7 +296,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
296 "ib_fmr(%s)", 296 "ib_fmr(%s)",
297 device->name); 297 device->name);
298 if (IS_ERR(pool->thread)) { 298 if (IS_ERR(pool->thread)) {
299 printk(KERN_WARNING PFX "couldn't start cleanup thread"); 299 printk(KERN_WARNING PFX "couldn't start cleanup thread\n");
300 ret = PTR_ERR(pool->thread); 300 ret = PTR_ERR(pool->thread);
301 goto out_free_pool; 301 goto out_free_pool;
302 } 302 }
@@ -314,7 +314,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
314 GFP_KERNEL); 314 GFP_KERNEL);
315 if (!fmr) { 315 if (!fmr) {
316 printk(KERN_WARNING PFX "failed to allocate fmr " 316 printk(KERN_WARNING PFX "failed to allocate fmr "
317 "struct for FMR %d", i); 317 "struct for FMR %d\n", i);
318 goto out_fail; 318 goto out_fail;
319 } 319 }
320 320
@@ -326,7 +326,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
326 fmr->fmr = ib_alloc_fmr(pd, params->access, &fmr_attr); 326 fmr->fmr = ib_alloc_fmr(pd, params->access, &fmr_attr);
327 if (IS_ERR(fmr->fmr)) { 327 if (IS_ERR(fmr->fmr)) {
328 printk(KERN_WARNING PFX "fmr_create failed " 328 printk(KERN_WARNING PFX "fmr_create failed "
329 "for FMR %d", i); 329 "for FMR %d\n", i);
330 kfree(fmr); 330 kfree(fmr);
331 goto out_fail; 331 goto out_fail;
332 } 332 }
@@ -381,7 +381,7 @@ void ib_destroy_fmr_pool(struct ib_fmr_pool *pool)
381 } 381 }
382 382
383 if (i < pool->pool_size) 383 if (i < pool->pool_size)
384 printk(KERN_WARNING PFX "pool still has %d regions registered", 384 printk(KERN_WARNING PFX "pool still has %d regions registered\n",
385 pool->pool_size - i); 385 pool->pool_size - i);
386 386
387 kfree(pool->cache_bucket); 387 kfree(pool->cache_bucket);
@@ -518,7 +518,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
518 518
519#ifdef DEBUG 519#ifdef DEBUG
520 if (fmr->ref_count < 0) 520 if (fmr->ref_count < 0)
521 printk(KERN_WARNING PFX "FMR %p has ref count %d < 0", 521 printk(KERN_WARNING PFX "FMR %p has ref count %d < 0\n",
522 fmr, fmr->ref_count); 522 fmr, fmr->ref_count);
523#endif 523#endif
524 524