vmxnet3: fix publicity of NETIF_F_HIGHDMA

[pandora-kernel.git] / drivers / target / target_core_tmr.c

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 4a10983..179063d 100644 (file)
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -55,7 +55,8 @@ struct se_tmr_req *core_tmr_alloc_req(
 {
        struct se_tmr_req *tmr;
 
-       tmr = kmem_cache_zalloc(se_tmr_req_cache, GFP_KERNEL);
+       tmr = kmem_cache_zalloc(se_tmr_req_cache, (in_interrupt()) ?
+                                       GFP_ATOMIC : GFP_KERNEL);
        if (!(tmr)) {
                printk(KERN_ERR "Unable to allocate struct se_tmr_req\n");
                return ERR_PTR(-ENOMEM);
@@ -74,10 +75,16 @@ void core_tmr_release_req(
 {
        struct se_device *dev = tmr->tmr_dev;
 
+       if (!dev) {
+               kmem_cache_free(se_tmr_req_cache, tmr);
+               return;
+       }
+
        spin_lock(&dev->se_tmr_lock);
        list_del(&tmr->tmr_list);
-       kmem_cache_free(se_tmr_req_cache, tmr);
        spin_unlock(&dev->se_tmr_lock);
+
+       kmem_cache_free(se_tmr_req_cache, tmr);
 }
 
 static void core_tmr_handle_tas_abort(
@@ -398,9 +405,9 @@ int core_tmr_lun_reset(
                printk(KERN_INFO "LUN_RESET: SCSI-2 Released reservation\n");
        }
 
-       spin_lock(&dev->stats_lock);
+       spin_lock_irq(&dev->stats_lock);
        dev->num_resets++;
-       spin_unlock(&dev->stats_lock);
+       spin_unlock_irq(&dev->stats_lock);
 
        DEBUG_LR("LUN_RESET: %s for [%s] Complete\n",
                        (preempt_and_abort_list) ? "Preempt" : "TMR",