eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Set block size for loop device if supported by kernel (4.13+)."

Browse Source 
This reverts commit 4e2deadba7.

There is too many cases with 4k unaligned images that this optimization
adds more problems than it solves. Revert it for now.
This commit is contained in:
Milan Broz
2017-08-23 08:07:27 +02:00
parent 540972ff59
commit 6e057c010f
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/utils_loop.c
View File

@@ -32,9 +32,6 @@
#ifdef HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h> /* for major, minor */
#endif
#ifdef HAVE_SYS_STATVFS_H
# include <sys/statvfs.h>
#endif
#include <linux/loop.h>
#include "utils_loop.h"
@@ -53,11 +50,6 @@
#define LOOP_SET_CAPACITY 0x4C07
#endif
#ifndef LO_FLAGS_BLOCKSIZE
#define LO_FLAGS_BLOCKSIZE 32
#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
#endif
static char *crypt_loop_get_device_old(void)
{
char dev[20];
@@ -108,21 +100,6 @@ static char *crypt_loop_get_device(void)
return strdup(dev);
}
static size_t crypt_loop_block_size_fd(int fd)
{
size_t bs = 512;
#ifdef HAVE_SYS_STATVFS_H
struct statvfs buf;
if (!fstatvfs(fd, &buf) && buf.f_bsize)
bs = (size_t)buf.f_bsize;
if (bs != 1024 && bs != 2048 && bs != 4096)
bs = 512;
#endif
return bs;
}
int crypt_loop_attach(char **loop, const char *file, int offset,
int autoclear, int *readonly)
{
@@ -167,9 +144,6 @@ int crypt_loop_attach(char **loop, const char *file, int offset,
if (autoclear)
lo64.lo_flags |= LO_FLAGS_AUTOCLEAR;
LO_INFO_BLOCKSIZE(&lo64) = crypt_loop_block_size_fd(file_fd);
lo64.lo_flags |= LO_FLAGS_BLOCKSIZE;
if (ioctl(loop_fd, LOOP_SET_STATUS64, &lo64) < 0) {
(void)ioctl(loop_fd, LOOP_CLR_FD, 0);
goto out;