summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authornijel8 <nijel8@gmail.com>2017-02-19 03:15:41 +0100
committer_that <android@that.at>2017-02-19 21:34:12 +0100
commit2dd66f4962436fe0f90790278a15c5ce88e85ff0 (patch)
treef5563a618ac3e445304812cd660d6acb76787239 /crypto
parentAdd a listxattr tool for listing xattrs (diff)
downloadandroid_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar.gz
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar.bz2
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar.lz
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar.xz
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.tar.zst
android_bootable_recovery-2dd66f4962436fe0f90790278a15c5ce88e85ff0.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/lollipop/cryptfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index 986507e22..f0822063e 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -713,13 +713,13 @@ static void get_device_scrypt_params(struct crypt_mnt_ftr *ftr) {
static unsigned int get_blkdev_size(int fd)
{
- unsigned int nr_sec;
+ unsigned long nr_sec;
if ( (ioctl(fd, BLKGETSIZE, &nr_sec)) == -1) {
nr_sec = 0;
}
- return nr_sec;
+ return (unsigned int) nr_sec;
}
static int get_crypt_ftr_info(char **metadata_fname, off64_t *off)