summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-01-26 10:48:42 +0300
committerTyler Hicks <tyhicks@canonical.com>2013-01-28 16:38:37 -0800
commita07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362 (patch)
tree46f3dfab951daefbbb4dc74580cb364ac44cff27 /fs
parent111d61a25ec11c1837ac0fd81bf4b845d3327fb7 (diff)
downloadop-kernel-dev-a07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362.zip
op-kernel-dev-a07c48ad5be5cbf32a2741f10e6fbf4bbfcaa362.tar.gz
eCryptfs: remove unneeded checks in virt_to_scatterlist()
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/crypto.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index a7b0c2d..d5c25db 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -301,17 +301,14 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
while (size > 0 && i < sg_size) {
pg = virt_to_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;
if (size >= remainder_of_page) {
- if (sg)
- sg[i].length = remainder_of_page;
+ sg[i].length = remainder_of_page;
addr += remainder_of_page;
size -= remainder_of_page;
} else {
- if (sg)
- sg[i].length = size;
+ sg[i].length = size;
addr += size;
size = 0;
}
OpenPOWER on IntegriCloud