Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275565
b: refs/heads/master
c: 6b76106
h: refs/heads/master
i:
  275563: bb3fd4a
v: v3
  • Loading branch information
Ben Hutchings authored and Jens Axboe committed Nov 13, 2011
1 parent 3593dfd commit b72477f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 193733585692301f38d489b8ad8724c2f88349c0
refs/heads/master: 6b76106d8ef31111d6fc469564b83b5f5542794f
7 changes: 4 additions & 3 deletions trunk/block/blk-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,11 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
if (!iov[i].iov_len)
return -EINVAL;

if (uaddr & queue_dma_alignment(q)) {
/*
* Keep going so we check length of all segments
*/
if (uaddr & queue_dma_alignment(q))
unaligned = 1;
break;
}
}

if (unaligned || (q->dma_pad_mask & len) || map_data)
Expand Down

0 comments on commit b72477f

Please sign in to comment.