diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-09-08 14:15:42 +0300 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2014-09-23 13:36:19 +0000 |
| commit | d9b1e6374b3a9b88774e30d0c6bf6e394cd10b76 (patch) | |
| tree | 759df9442e7f40a8e804ff5cb5f06b6ba52df070 | |
| parent | 15d036094b75e63a3817ec4f836959d38cecb1e6 (diff) | |
| download | blackbird-op-linux-d9b1e6374b3a9b88774e30d0c6bf6e394cd10b76.tar.gz blackbird-op-linux-d9b1e6374b3a9b88774e30d0c6bf6e394cd10b76.zip | |
xen-scsifront: use GFP_ATOMIC under spin_lock
This function is only called with a spin_lock held and IRQs disabled.
The allocation is not allowed to sleep and NOIO is not sufficient, it
has to be ATOMIC.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
| -rw-r--r-- | drivers/scsi/xen-scsifront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index 0aceb70e1d83..7e88659bf5af 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -359,7 +359,7 @@ static int map_data_for_request(struct vscsifrnt_info *info, } seg_grants = vscsiif_grants_sg(data_grants); shadow->sg = kcalloc(data_grants, - sizeof(struct scsiif_request_segment), GFP_NOIO); + sizeof(struct scsiif_request_segment), GFP_ATOMIC); if (!shadow->sg) return -ENOMEM; } |
