diff options
| -rw-r--r-- | include/loopdev.h | 2 | ||||
| -rw-r--r-- | lib/loopdev.c | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/include/loopdev.h b/include/loopdev.h index bbc0d3dd7..0e3a7517a 100644 --- a/include/loopdev.h +++ b/include/loopdev.h @@ -96,6 +96,7 @@ struct loopdev_cxt { char *filename; /* backing file for loopcxt_set_... */ int fd; /* open(/dev/looo<N>) */ int mode; /* fd mode O_{RDONLY,RDWR} */ + uint64_t blocksize; /* used by loopcxt_setup_device() */ int flags; /* LOOPDEV_FL_* flags */ unsigned int has_info:1; /* .info contains data */ @@ -173,6 +174,7 @@ extern int loopcxt_ioctl_blocksize(struct loopdev_cxt *lc, uint64_t blocksize); int loopcxt_set_offset(struct loopdev_cxt *lc, uint64_t offset); int loopcxt_set_sizelimit(struct loopdev_cxt *lc, uint64_t sizelimit); +int loopcxt_set_blocksize(struct loopdev_cxt *lc, uint64_t blocksize); int loopcxt_set_flags(struct loopdev_cxt *lc, uint32_t flags); int loopcxt_set_backing_file(struct loopdev_cxt *lc, const char *filename); diff --git a/lib/loopdev.c b/lib/loopdev.c index 556c4df26..a57650cb5 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -96,6 +96,7 @@ int loopcxt_set_device(struct loopdev_cxt *lc, const char *device) } lc->fd = -1; lc->mode = 0; + lc->blocksize = 0; lc->has_info = 0; lc->info_failed = 0; *lc->device = '\0'; @@ -1107,6 +1108,22 @@ int loopcxt_set_sizelimit(struct loopdev_cxt *lc, uint64_t sizelimit) } /* + * The blocksize will be used by loopcxt_set_device(). For already exiting + * devices use loopcxt_ioctl_blocksize(). + * + * The setting is removed by loopcxt_set_device() loopcxt_next()! + */ +int loopcxt_set_blocksize(struct loopdev_cxt *lc, uint64_t blocksize) +{ + if (!lc) + return -EINVAL; + lc->blocksize = blocksize; + + DBG(CXT, ul_debugobj(lc, "set blocksize=%jd", blocksize)); + return 0; +} + +/* * @lc: context * @flags: kernel LO_FLAGS_{READ_ONLY,USE_AOPS,AUTOCLEAR} flags * @@ -1331,6 +1348,12 @@ int loopcxt_setup_device(struct loopdev_cxt *lc) DBG(SETUP, ul_debugobj(lc, "LOOP_SET_FD: OK")); + if (lc->blocksize > 0 + && (rc = loopcxt_ioctl_blocksize(lc, lc->blocksize)) < 0) { + errsv = -rc; + goto err; + } + if (ioctl(dev_fd, LOOP_SET_STATUS64, &lc->info)) { rc = -errno; errsv = errno; |