From 05a63bfaf54fe3b06c46720d48993cd3aac1e3ad Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 10 Jun 2009 12:57:07 -0700 Subject: [PATCH] --- yaml --- r: 147089 b: refs/heads/master c: 0e0c62123b517d2b3c26922342c0cc5bb63a93f8 h: refs/heads/master i: 147087: ba1c1a0df0595e37e45bd3e3f16357231f1634a3 v: v3 --- [refs] | 2 +- trunk/fs/bio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 311e5d1d8294..c2019d46162a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9c7d394a8ebacb60097b192939ae9f15235225e +refs/heads/master: 0e0c62123b517d2b3c26922342c0cc5bb63a93f8 diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c index ab423a1024ab..533266a5e584 100644 --- a/trunk/fs/bio.c +++ b/trunk/fs/bio.c @@ -722,7 +722,7 @@ static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs, while (bv_len && iov_idx < iov_count) { unsigned int bytes; - char *iov_addr; + char __user *iov_addr; bytes = min_t(unsigned int, iov[iov_idx].iov_len - iov_off, bv_len);