diff options
| author | Jiri Kosina | 2016-04-18 11:18:55 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2016-04-18 11:18:55 +0200 |
| commit | 9938b04472d5c59f8bd8152a548533a8599596a2 (patch) | |
| tree | 0fc8318100878c5e446076613ec02a97aa179119 /drivers/mtd/sm_ftl.c | |
| parent | Doc: treewide : Fix typos in DocBook/filesystem.xml (diff) | |
| parent | Linux 4.6-rc4 (diff) | |
| download | kernel-qcow2-linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.gz kernel-qcow2-linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.xz kernel-qcow2-linux-9938b04472d5c59f8bd8152a548533a8599596a2.zip | |
Merge branch 'master' into for-next
Sync with Linus' tree so that patches against newer codebase can be applied.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/mtd/sm_ftl.c')
| -rw-r--r-- | drivers/mtd/sm_ftl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c index c23184a47fc4..b096f8bb05ba 100644 --- a/drivers/mtd/sm_ftl.c +++ b/drivers/mtd/sm_ftl.c @@ -206,9 +206,10 @@ static loff_t sm_mkoffset(struct sm_ftl *ftl, int zone, int block, int boffset) } /* Breaks offset into parts */ -static void sm_break_offset(struct sm_ftl *ftl, loff_t offset, +static void sm_break_offset(struct sm_ftl *ftl, loff_t loffset, int *zone, int *block, int *boffset) { + u64 offset = loffset; *boffset = do_div(offset, ftl->block_size); *block = do_div(offset, ftl->max_lba); *zone = offset >= ftl->zone_count ? -1 : offset; |