diff options
author | Roland Dreier <roland@purestorage.com> | 2011-10-06 12:56:16 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-10-23 23:20:53 -0400 |
commit | dd503a5fcc0dfb8b5fd887bd967b6f431176864b (patch) | |
tree | 59d5bd7db7d4040ea91def8676cca5334f9926a6 /drivers/target/iscsi | |
parent | 942d82646e16725ac366d44087b8c992f2cb2190 (diff) |
target: Have core_tmr_alloc_req() take an explicit GFP_xxx flag
Testing in_interrupt() to know when sleeping is allowed is not really
reliable (since eg it won't be true if the caller is holding a spinlock).
Instead have the caller tell core_tmr_alloc_req() what GFP_xxx to use;
every caller except tcm_qla2xxx can use GFP_KERNEL.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index f00137f377b..c4be6223b9c 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c | |||
@@ -289,7 +289,8 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr( | |||
289 | } | 289 | } |
290 | 290 | ||
291 | se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd, | 291 | se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd, |
292 | (void *)cmd->tmr_req, tcm_function); | 292 | (void *)cmd->tmr_req, tcm_function, |
293 | GFP_KERNEL); | ||
293 | if (!se_cmd->se_tmr_req) | 294 | if (!se_cmd->se_tmr_req) |
294 | goto out; | 295 | goto out; |
295 | 296 | ||