RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-09 01:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6394 from dillaman/wip-13560

Browse Source 
krbd: remove deprecated --quiet param from udevadm

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Josh Durgin 2015-11-09 23:30:42 -08:00
commit 15f8ea00e4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/run_cmd.cc
View File

@ -47,6 +47,9 @@ std::string run_cmd(const char *cmd, ...)
}
else if (fret == 0) {
// execvp doesn't modify its arguments, so the const-cast here is safe.
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);
execvp(cmd, (char * const*)&arr[0]);
_exit(127);
}

3
src/krbd.cc
View File

@ -521,8 +521,7 @@ static int do_unmap(struct udev *udev, dev_t devno, const string& id)
* libudev does not provide the "wait until the queue is empty"
* API or the sufficient amount of primitives to build it from.
*/
string err = run_cmd("udevadm", "settle", "--timeout", "10", "--quiet",
NULL);
string err = run_cmd("udevadm", "settle", "--timeout", "10", NULL);
if (!err.empty())
cerr << "rbd: " << err << std::endl;
}