diff options
| author | Matthias Koenig | 2007-07-18 16:15:46 +0200 |
|---|---|---|
| committer | Karel Zak | 2007-07-27 13:39:29 +0200 |
| commit | 2018629905d3d881ff3fddf76552b6e79091f2b8 (patch) | |
| tree | f51632da5d7c7a47a83ec77f94174dd265ecd7ed | |
| parent | remove hardcoded package name from some utils (diff) | |
| download | kernel-qcow2-util-linux-2018629905d3d881ff3fddf76552b6e79091f2b8.tar.gz kernel-qcow2-util-linux-2018629905d3d881ff3fddf76552b6e79091f2b8.tar.xz kernel-qcow2-util-linux-2018629905d3d881ff3fddf76552b6e79091f2b8.zip | |
disk-utils: let mkfs tools open with O_EXCL
Let mkswap, mkfs.bfs, mkfs.minix open with O_EXCL if
used on block devices to prevent writing to the device
even if they are busy (mounted).
Unfortunately, O_EXCL has zero effect for 2.4 kernels where
in-kernel code doesn't use O_EXCL-like access locks. (Tested
on RHEL3.)
Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/mkfs.bfs.c | 2 | ||||
| -rw-r--r-- | disk-utils/mkfs.minix.c | 9 | ||||
| -rw-r--r-- | disk-utils/mkswap.c | 12 |
3 files changed, 17 insertions, 6 deletions
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index 8221f3b7e..557cde480 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -170,7 +170,7 @@ main(int argc, char *argv[]) { if (!S_ISBLK(statbuf.st_mode)) fatal(_("%s is not a block special device"), device); - fd = open(device, O_RDWR); + fd = open(device, O_RDWR | O_EXCL); if (fd == -1) { perror(device); fatal(_("cannot open %s"), device); diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 92a6789a7..8a81e7cad 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -699,11 +699,14 @@ main(int argc, char ** argv) { tmp += dirsize; *(short *)tmp = 2; strcpy(tmp+2,".badblocks"); - DEV = open(device_name,O_RDWR ); + if (stat(device_name, &statbuf) < 0) + die(_("unable to stat %s")); + if (S_ISBLK(statbuf.st_mode)) + DEV = open(device_name,O_RDWR | O_EXCL); + else + DEV = open(device_name,O_RDWR); if (DEV<0) die(_("unable to open %s")); - if (fstat(DEV,&statbuf)<0) - die(_("unable to stat %s")); if (!S_ISBLK(statbuf.st_mode)) check=0; else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 1fd1f185b..6af1ff7bb 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -640,8 +640,16 @@ main(int argc, char ** argv) { usage(); } - DEV = open(device_name,O_RDWR); - if (DEV < 0 || fstat(DEV, &statbuf) < 0) { + if (stat(device_name, &statbuf) < 0) { + perror(device_name); + exit(EXIT_FAILURE); + } + if (S_ISBLK(statbuf.st_mode)) + DEV = open(device_name, O_RDWR | O_EXCL); + else + DEV = open(device_name, O_RDWR); + + if (DEV < 0) { perror(device_name); exit(1); } |