tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path

Linus Torvalds f9d1c6ca a8051fde

+2 -4
unified split
+1 -1
drivers/infiniband/core/uverbs_main.c
··· 423 423 unsigned long flags; 424 424 425 425 spin_lock_irqsave(&file->async_file->lock, flags); 426 - if (!file->async_file->is_closed) { 426 + if (file->async_file->is_closed) { 427 427 spin_unlock_irqrestore(&file->async_file->lock, flags); 428 428 return; 429 429 }
+1 -3
drivers/infiniband/hw/nes/nes_verbs.c
··· 2456 2456 if ((page_count!=0)&&(page_count<<12)-(region->offset&(4096-1))>=region->length) 2457 2457 goto enough_pages; 2458 2458 if ((page_count&0x01FF) == 0) { 2459 - if (page_count>(1024*512)) { 2459 + if (page_count >= 1024 * 512) { 2460 2460 ib_umem_release(region); 2461 - pci_free_consistent(nesdev->pcidev, 4096, vpbl.pbl_vbase, 2462 - vpbl.pbl_pbase); 2463 2461 nes_free_resource(nesadapter, 2464 2462 nesadapter->allocated_mrs, stag_index); 2465 2463 kfree(nesmr);