Doug Ledford: Clean up usage of open()

[Martin F. Krafft]

Module: mdadm
Branch: build
Commit: fb97b4d691c04d9303571d7eba3cef4a97264e2f
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=fb97b4d691c04d9303571d7eba3cef4a97264e2f

Author: Doug Ledford <dledford at redhat.com>
Date:   Thu Jul 24 18:35:11 2008 -0400

Clean up usage of open()
	Fix on call that passed an invalid mode to open
	Don't pass a third arg unless we also pass O_CREAT
	Use symbolic args for 2nd and 3rd args

Signed-off-by: Doug Ledford <dledford at redhat.com>

---

 Create.c     |    4 ++--
 Detail.c     |    2 +-
 Grow.c       |    2 +-
 Monitor.c    |    2 +-
 Query.c      |    2 +-
 mdassemble.c |    2 +-
 mdopen.c     |    4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Create.c b/Create.c
index 8407579..7b1836a 100644
--- a/Create.c
+++ b/Create.c
@@ -212,7 +212,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		info.array.working_disks++;
 		if (dnum < raiddisks)
 			info.array.active_disks++;
-		fd = open(dname, O_RDONLY|O_EXCL, 0);
+		fd = open(dname, O_RDONLY|O_EXCL);
 		if (fd <0 ) {
 			fprintf(stderr, Name ": Cannot open %s: %s\n",
 				dname, strerror(errno));
@@ -543,7 +543,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				info.disk.minor = 0;
 				info.disk.state = (1<<MD_DISK_FAULTY);
 			} else {
-				fd = open(dv->devname, O_RDONLY|O_EXCL, 0);
+				fd = open(dv->devname, O_RDONLY|O_EXCL);
 				if (fd < 0) {
 					fprintf(stderr, Name ": failed to open %s after earlier success - aborting\n",
 						dv->devname);
diff --git a/Detail.c b/Detail.c
index 2488c03..2b2111c 100644
--- a/Detail.c
+++ b/Detail.c
@@ -38,7 +38,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
 	 * GET_ARRAY_INFO and GET_DISK_INFO ioctl calls
 	 */
 
-	int fd = open(dev, O_RDONLY, 0);
+	int fd = open(dev, O_RDONLY);
 	int vers;
 	mdu_array_info_t array;
 	mdu_disk_info_t *disks;
diff --git a/Grow.c b/Grow.c
index c2eae32..a8194bf 100644
--- a/Grow.c
+++ b/Grow.c
@@ -686,7 +686,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 			}
 		spares = sra->array.spare_disks;
 		if (backup_file) {
-			fdlist[d] = open(backup_file, O_RDWR|O_CREAT|O_EXCL, 0600);
+			fdlist[d] = open(backup_file, O_RDWR|O_CREAT|O_EXCL, S_IRUSR | S_IWUSR);
 			if (fdlist[d] < 0) {
 				fprintf(stderr, Name ": %s: cannot create backup file %s: %s\n",
 					devname, backup_file, strerror(errno));
diff --git a/Monitor.c b/Monitor.c
index 54193f5..abc2dbd 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -156,7 +156,7 @@ int Monitor(mddev_dev_t devlist,
 			return 1;
 		}
 		close(0);
-		open("/dev/null", 3);
+		open("/dev/null", O_RDWR);
 		dup2(0,1);
 		dup2(0,2);
 		setsid();
diff --git a/Query.c b/Query.c
index 0802964..190ee29 100644
--- a/Query.c
+++ b/Query.c
@@ -37,7 +37,7 @@ int Query(char *dev)
 	 * whether it is an md device and whether it has
 	 * a superblock
 	 */
-	int fd = open(dev, O_RDONLY, 0);
+	int fd = open(dev, O_RDONLY);
 	int vers;
 	int ioctlerr;
 	int superror, superrno;
diff --git a/mdassemble.c b/mdassemble.c
index 9926dde..b0d87b8 100644
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -57,7 +57,7 @@ mapping_t pers[] = {
 /* from mdopen.c */
 int open_mddev(char *dev, int autof/*unused */)
 {
-	int mdfd = open(dev, O_RDWR, 0);
+	int mdfd = open(dev, O_RDWR);
 	if (mdfd < 0)
 		fprintf(stderr, Name ": error opening %s: %s\n",
 			dev, strerror(errno));
diff --git a/mdopen.c b/mdopen.c
index 448a9eb..4fbcb48 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -173,7 +173,7 @@ int open_mddev(char *dev, int autof)
 			must_remove = 1;
 		if (stb.st_mode && !must_remove) {
 			/* looks ok, see if it is available */
-			mdfd = open(dev, O_RDWR, 0);
+			mdfd = open(dev, O_RDWR);
 			if (mdfd < 0) {
 				fprintf(stderr, Name ": error opening %s: %s\n",
 					dev, strerror(errno));
@@ -254,7 +254,7 @@ int open_mddev(char *dev, int autof)
 				make_parts(dev,parts, ci->symlinks);
 		}
 	}
-	mdfd = open(dev, O_RDWR, 0);
+	mdfd = open(dev, O_RDWR);
 	if (mdfd < 0)
 		fprintf(stderr, Name ": error opening %s: %s\n",
 			dev, strerror(errno));