lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	net/core/dev.c
This commit is contained in:
David S. Miller
2010-10-21 08:43:05 -07:00
parent 9941fb6276 db5a753bf1
commit 2198a10b50
192 changed files with 1306 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net/rds/page.c
View File

@ -58,30 +58,17 @@ int rds_page_copy_user(struct page *page, unsigned long offset,
unsigned long ret;
void *addr;
if (to_user)
addr = kmap(page);
if (to_user) {
rds_stats_add(s_copy_to_user, bytes);
else
ret = copy_to_user(ptr, addr + offset, bytes);
} else {
rds_stats_add(s_copy_from_user, bytes);
addr = kmap_atomic(page, KM_USER0);
if (to_user)
ret = __copy_to_user_inatomic(ptr, addr + offset, bytes);
else
ret = __copy_from_user_inatomic(addr + offset, ptr, bytes);
kunmap_atomic(addr, KM_USER0);
if (ret) {
addr = kmap(page);
if (to_user)
ret = copy_to_user(ptr, addr + offset, bytes);
else
ret = copy_from_user(addr + offset, ptr, bytes);
kunmap(page);
if (ret)
return -EFAULT;
ret = copy_from_user(addr + offset, ptr, bytes);
}
kunmap(page);
return 0;
return ret ? -EFAULT : 0;
}
EXPORT_SYMBOL_GPL(rds_page_copy_user);