"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "mdadm.c" between
mdadm-4.2-rc1.tar.xz and mdadm-4.2-rc2.tar.xz

About: mdadm is a tool for creating, managing and monitoring device arrays using the "md" driver in Linux, also known as Software RAID arrays.

mdadm.c  (mdadm-4.2-rc1.tar.xz):mdadm.c  (mdadm-4.2-rc2.tar.xz)
skipping to change at line 1662 skipping to change at line 1662
pr_err("Cannot monitor: need --scan or at least one devic e\n"); pr_err("Cannot monitor: need --scan or at least one devic e\n");
rv = 1; rv = 1;
break; break;
} }
if (pidfile && !daemonise) { if (pidfile && !daemonise) {
pr_err("Cannot write a pid file when not in daemon mode\n "); pr_err("Cannot write a pid file when not in daemon mode\n ");
rv = 1; rv = 1;
break; break;
} }
if (c.delay == 0) { if (c.delay == 0) {
if (get_linux_version() > 2006016) c.delay = conf_get_monitor_delay();
/* mdstat responds to poll */ if (!c.delay)
c.delay = 1000;
else
c.delay = 60; c.delay = 60;
} }
rv = Monitor(devlist, mailaddr, program, rv = Monitor(devlist, mailaddr, program,
&c, daemonise, oneshot, &c, daemonise, oneshot,
dosyslog, pidfile, increments, dosyslog, pidfile, increments,
spare_sharing); spare_sharing);
break; break;
case GROW: case GROW:
if (array_size > 0) { if (array_size > 0) {
skipping to change at line 2044 skipping to change at line 2042
if (dv->devname[0] == '/' || mdfd < 0) if (dv->devname[0] == '/' || mdfd < 0)
mdfd = open_mddev(dv->devname, 1); mdfd = open_mddev(dv->devname, 1);
if (mdfd >= 0) { if (mdfd >= 0) {
switch(dv->disposition) { switch(dv->disposition) {
case 'R': case 'R':
c->runstop = 1; c->runstop = 1;
rv |= Manage_run(dv->devname, mdfd, c); rv |= Manage_run(dv->devname, mdfd, c);
break; break;
case 'S': case 'S':
if (c->scan) {
pr_err("--stop not meaningful with both a
--scan assembly and a device name.\n");
rv |= 1;
break;
}
rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0);
break; break;
case 'o': case 'o':
rv |= Manage_ro(dv->devname, mdfd, 1); rv |= Manage_ro(dv->devname, mdfd, 1);
break; break;
case 'w': case 'w':
rv |= Manage_ro(dv->devname, mdfd, -1); rv |= Manage_ro(dv->devname, mdfd, -1);
break; break;
} }
close(mdfd); close(mdfd);
 End of changes. 2 change blocks. 
4 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)