From 1dcdbaba23b466b6c1b6ebdfb64872ba8b59b89a Mon Sep 17 00:00:00 2001 From: Guo Chao Date: Thu, 21 Feb 2013 15:16:50 -0800 Subject: [PATCH] --- yaml --- r: 359549 b: refs/heads/master c: b7a1da695f3fb33d093e6de20b1dfc238e3c9587 h: refs/heads/master i: 359547: 2d9340ccc57027b5c8a2b3acc70dd5ecc05cfb8b v: v3 --- [refs] | 2 +- trunk/drivers/block/loop.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c2103151c75e..af9e85c7e2d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a6650406875b9097a032eed89af50682fe1160 +refs/heads/master: b7a1da695f3fb33d093e6de20b1dfc238e3c9587 diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c index 1b1b0c981a85..bef9d63b0c83 100644 --- a/trunk/drivers/block/loop.c +++ b/trunk/drivers/block/loop.c @@ -162,12 +162,13 @@ static struct loop_func_table *xfer_funcs[MAX_LO_CRYPT] = { static loff_t get_size(loff_t offset, loff_t sizelimit, struct file *file) { - loff_t size, loopsize; + loff_t loopsize; /* Compute loopsize in bytes */ - size = i_size_read(file->f_mapping->host); - loopsize = size - offset; - /* offset is beyond i_size, wierd but possible */ + loopsize = i_size_read(file->f_mapping->host); + if (offset > 0) + loopsize -= offset; + /* offset is beyond i_size, weird but possible */ if (loopsize < 0) return 0;