redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

eCryptfs: remove unneeded checks in virt_to_scatterlist()

Browse source 
This is always called with a valid "sg" pointer.  My static checker
complains because the call to sg_init_table() dereferences "sg" before
we reach the checks.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Dan Carpenter 2013-01-26 10:48:42 +03:00 committed by Tyler Hicks
parent 111d61a25e
commit a07c48ad5b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/ecryptfs/crypto.c
View file

@ -301,16 +301,13 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
while (size > 0 && i < sg_size) { while (size > 0 && i < sg_size) {
pg = virt_to_page(addr); pg = virt_to_page(addr);
offset = offset_in_page(addr); offset = offset_in_page(addr);
if (sg)
sg_set_page(&sg[i], pg, 0, offset); sg_set_page(&sg[i], pg, 0, offset);
remainder_of_page = PAGE_CACHE_SIZE - offset; remainder_of_page = PAGE_CACHE_SIZE - offset;
if (size >= remainder_of_page) { if (size >= remainder_of_page) {
if (sg)
sg[i].length = remainder_of_page; sg[i].length = remainder_of_page;
addr += remainder_of_page; addr += remainder_of_page;
size -= remainder_of_page; size -= remainder_of_page;
} else { } else {
if (sg)
sg[i].length = size; sg[i].length = size;
addr += size; addr += size;
size = 0; size = 0;