ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

partx: get partition number with sysfs lib 

Now that we have this feature, there's no need to manually parse sysfs in partx.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
This commit is contained in:
Davidlohr Bueso 2011-07-17 12:47:30 -04:00 committed by Karel Zak
parent 0cbeee27a3
commit a88268b8cc
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
partx/Makefile.am
View File

@ -6,6 +6,7 @@ dist_man_MANS = addpart.8 delpart.8
usrsbin_exec_PROGRAMS += partx
partx_SOURCES = partx.c partx.h \
$(top_srcdir)/lib/blkdev.c \
$(top_srcdir)/lib/sysfs.c \
$(top_srcdir)/lib/tt.c \
$(top_srcdir)/lib/at.c \
$(top_srcdir)/lib/mbsalign.c \

20
partx/partx.c
View File

@ -30,6 +30,7 @@
#include "strutils.h"
#include "xalloc.h"
#include "partx.h"
#include "sysfs.h"
#include "at.h"
/* this is the default upper limit, could be modified by --nr */
@ -123,8 +124,6 @@ static int column_name_to_id(const char *name, size_t namesz)
*
* Note that this function tries to use sysfs, otherwise it assumes that the
* last characters are always numeric (sda1, sdc20, etc).
*
* Returns -1 on error.
*/
static int get_partno_from_device(char *partition, dev_t devno)
{
@ -135,21 +134,10 @@ static int get_partno_from_device(char *partition, dev_t devno)
assert(partition);
if (devno) {
/* the device exists, read the partition number from /sys
* TODO: move this to stuff to lib/sysfs.c */
char path[PATH_MAX];
FILE *f;
struct sysfs_cxt cxt;
snprintf(path, sizeof(path),
_PATH_SYS_DEVBLOCK "/%d:%d/partition",
major(devno), minor(devno));
f = fopen(path, "r");
if (f) {
if (fscanf(f, "%d", &partno) != 1)
partno = 0;
fclose(f);
}
if (partno)
sysfs_init(&cxt, devno, NULL);
if (sysfs_read_int(&cxt, "partition", &partno) >= 0)
return partno;
}