Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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@redhat.com>
This commit is contained in:
Doug Ledford 2008-07-24 18:35:11 -04:00
parent 0bc38b5020
commit fb97b4d691
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Create.c
View File

@ -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);

2
Detail.c
View File

@ -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;

2
Grow.c
View File

@ -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));

2
Monitor.c
View File

@ -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();

2
Query.c
View File

@ -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;

2
mdassemble.c
View File

@ -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));

4
mdopen.c
View File

@ -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));