From: Gene Czarcinski <gene@czarc.net>
To: linux-btrfs@vger.kernel.org
Cc: Nirbheek Chauhan <nirbheek.chauhan@collabora.co.uk>,
Gene Czarcinski <gene@czarc.net>
Subject: [PATCH 02/13] Btrfs-progs: fix resolving of loop devices
Date: Sun, 20 Jan 2013 16:04:07 -0500 [thread overview]
Message-ID: <1358715858-4469-3-git-send-email-gene@czarc.net> (raw)
In-Reply-To: <1358715858-4469-1-git-send-email-gene@czarc.net>
From: Nirbheek Chauhan <nirbheek.chauhan@collabora.co.uk>
The LOOP_GET_STATUS ioctl truncates filenames to 64 characters. We should get
the backing file for a given loop device from /sys/. This is how losetup does it
as well.
Signed-off-by: Gene Czarcinski <gene@czarc.net>
---
utils.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/utils.c b/utils.c
index 51b78d5..7953ef9 100644
--- a/utils.c
+++ b/utils.c
@@ -20,6 +20,7 @@
#define __USE_XOPEN2K
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#ifndef __CHECKER__
#include <sys/ioctl.h>
#include <sys/mount.h>
@@ -653,21 +654,22 @@ int is_loop_device (const char* device) {
* the associated file (e.g. /images/my_btrfs.img) */
int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
{
- int loop_fd;
- int ret_ioctl;
- struct loop_info loopinfo;
+ int ret;
+ FILE *f;
+ char fmt[20];
+ char p[PATH_MAX];
+ char real_loop_dev[PATH_MAX];
- if ((loop_fd = open(loop_dev, O_RDONLY)) < 0)
+ if (!realpath(loop_dev, real_loop_dev))
+ return -errno;
+ snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
+ if (!(f = fopen(p, "r")))
return -errno;
- ret_ioctl = ioctl(loop_fd, LOOP_GET_STATUS, &loopinfo);
- close(loop_fd);
-
- if (ret_ioctl == 0) {
- strncpy(loop_file, loopinfo.lo_name, max_len);
- if (max_len > 0)
- loop_file[max_len-1] = 0;
- } else
+ snprintf(fmt, 20, "%%%i[^\n]", max_len-1);
+ ret = fscanf(f, fmt, loop_file);
+ fclose(f);
+ if (ret == EOF)
return -errno;
return 0;
--
1.8.1
next prev parent reply other threads:[~2013-01-20 21:04 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 21:04 [PATCH 00/13] Btrfs-progs: more patches for integration Gene Czarcinski
2013-01-20 21:04 ` [PATCH 01/13] btrfs-progs: btrfs-image.c: Added NULL pointer check Gene Czarcinski
2013-01-21 15:56 ` David Sterba
2013-01-22 17:34 ` Gene Czarcinski
2013-01-23 16:35 ` David Sterba
2013-01-23 18:16 ` Gene Czarcinski
2013-01-20 21:04 ` Gene Czarcinski [this message]
2013-01-21 16:14 ` [PATCH 02/13] Btrfs-progs: fix resolving of loop devices David Sterba
2013-01-22 17:50 ` David Sterba
2013-01-20 21:04 ` [PATCH 03/13] Btrfs-progs: correct btrfs receive usage string Gene Czarcinski
2013-01-20 21:04 ` [PATCH 04/13] Btrfs-progs: Fix a segmentation fault in btrfstune when <device> is invalid Gene Czarcinski
2013-01-20 21:04 ` [PATCH 05/13] Add btrfs-show-super Gene Czarcinski
2013-01-21 18:04 ` David Sterba
2013-01-21 19:54 ` Goffredo Baroncelli
2013-01-21 22:22 ` Stefan Behrens
2013-01-22 14:46 ` David Sterba
2013-01-20 21:04 ` [PATCH 06/13] btrfs-show-super.c Gene Czarcinski
2013-01-21 16:46 ` David Sterba
2013-01-22 18:00 ` Gene Czarcinski
2013-01-23 17:38 ` David Sterba
2013-01-22 20:51 ` [PATCH] Fix Makefile for gzip Gene Czarcinski
2013-01-22 20:51 ` [PATCH] fix btrfs-progs build Gene Czarcinski
2013-01-23 17:42 ` David Sterba
2013-01-20 21:04 ` [PATCH 07/13] Btrfs-progs: correcting misnamed parameter options for btrfs send Gene Czarcinski
2013-01-20 21:49 ` Gene Czarcinski
2013-01-20 23:59 ` [PATCH] " Gene Czarcinski
2013-01-20 21:04 ` [PATCH 08/13] Btrfs-progs: bugfix for subvolume parent determination in " Gene Czarcinski
2013-01-20 21:04 ` [PATCH 09/13] Btrfs-progs: fix arg parsing for btrfs qgroup limit commands Gene Czarcinski
2013-01-20 21:04 ` [PATCH 10/13] Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull Gene Czarcinski
2013-01-20 21:04 ` [PATCH 11/13] Btrfs-progs: check the relation of two group by real level numbers Gene Czarcinski
2013-01-20 21:04 ` [PATCH 12/13] Btrfs-progs: disable qgroupid 0 for quota_tree Gene Czarcinski
2013-01-21 14:11 ` Gene Czarcinski
2013-01-20 21:04 ` [PATCH 13/13] trivial patch for btrfs-progs Gene Czarcinski
2013-01-21 17:40 ` David Sterba
2013-01-22 18:59 ` Gene Czarcinski
2013-01-21 18:40 ` [PATCH 00/13] Btrfs-progs: more patches for integration (integration-20130121) David Sterba
[not found] ` <CAMO4zugaABrbTJB75Yyi_UravfSX81YyqJtmc3yGALrby7+RTQ@mail.gmail.com>
2013-01-22 17:03 ` Fwd: " praneeth u
2013-01-22 18:09 ` Gene Czarcinski
2013-01-22 20:14 ` Gene Czarcinski
2013-01-24 18:13 ` David Sterba
2013-01-24 21:07 ` Gene Czarcinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358715858-4469-3-git-send-email-gene@czarc.net \
--to=gene@czarc.net \
--cc=linux-btrfs@vger.kernel.org \
--cc=nirbheek.chauhan@collabora.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).