chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
[elogind.git]
/
extras
/
volume_id
/
vol_id.c
diff --git
a/extras/volume_id/vol_id.c
b/extras/volume_id/vol_id.c
index 1b180a7734cdee351aaa46f2d46b8b13f34216e5..a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09 100644
(file)
--- a/
extras/volume_id/vol_id.c
+++ b/
extras/volume_id/vol_id.c
@@
-32,7
+32,6
@@
#include "../../udev_utils.h"
#include "../../logging.h"
#include "volume_id/volume_id.h"
#include "../../udev_utils.h"
#include "../../logging.h"
#include "volume_id/volume_id.h"
-#include "volume_id/dasd.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
@@
-147,9
+146,6
@@
int main(int argc, char *argv[])
if (volume_id_probe_all(vid, 0, size) == 0)
goto print;
if (volume_id_probe_all(vid, 0, size) == 0)
goto print;
- if (volume_id_probe_dasd(vid) == 0)
- goto print;
-
if (print != PRINT_EXPORT)
fprintf(stderr, "%s: unknown volume type\n", node);
rc = 3;
if (print != PRINT_EXPORT)
fprintf(stderr, "%s: unknown volume type\n", node);
rc = 3;