From: Andreas Fenkart <afenkart@gmail.com>
To: kexec@lists.infradead.org
Cc: Andreas Fenkart <andreas.fenkart@dev.digitalstrom.org>
Subject: [PATCH] kexec: determine size of block device
Date: Fri, 9 Oct 2015 15:27:18 +0200 [thread overview]
Message-ID: <1444397238-14330-1-git-send-email-andreas.fenkart@dev.digitalstrom.org> (raw)
starting 'kexec -l /dev/mmcblk0p1' fails since the size of
a block device can not be determined with stat
Signed-off-by: Andreas Fenkart <andreas.fenkart@dev.digitalstrom.org>
---
kexec/kexec.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kexec/kexec.c b/kexec/kexec.c
index ff024f3..8b8846e 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -26,7 +26,9 @@
#include <stdlib.h>
#include <errno.h>
#include <limits.h>
+#include <sys/ioctl.h>
#include <sys/mman.h>
+#include <sys/mount.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/reboot.h>
@@ -554,6 +556,14 @@ char *slurp_file(const char *filename, off_t *r_size)
die("Can not seek to the begin of file %s: %s\n",
filename, strerror(errno));
buf = slurp_fd(fd, filename, size, &nread);
+ } else if (S_ISBLK(stats.st_mode)) {
+ /* taken from blockdev */
+ unsigned long long llu = -1;
+ err = ioctl(fd, BLKGETSIZE64, &llu);
+ if (err < 0)
+ die("Can't retrieve size of block device %s: %s\n",
+ filename, strerror(errno));
+ size = llu;
} else {
size = nread = stats.st_size;
buf = mmap(NULL, size,
--
2.5.1
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next reply other threads:[~2015-10-09 13:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-09 13:27 Andreas Fenkart [this message]
2015-10-16 1:30 ` [PATCH] kexec: determine size of block device Simon Horman
2015-10-19 9:32 ` Andreas Fenkart
2015-10-20 1:27 ` Simon Horman
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=1444397238-14330-1-git-send-email-andreas.fenkart@dev.digitalstrom.org \
--to=afenkart@gmail.com \
--cc=andreas.fenkart@dev.digitalstrom.org \
--cc=kexec@lists.infradead.org \
/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