Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

krbd: remove deprecated --quiet param from udevadm #6394

Merged
merged 2 commits into from Nov 10, 2015
Merged

krbd: remove deprecated --quiet param from udevadm #6394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46f7dc
run_cmd: close parent process console file descriptors
Oct 27, 2015
4300f2a
krbd: remove deprecated --quiet param from udevadm
Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/common/run_cmd.cc
View file
Open in desktop
Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions src/krbd.cc
View file
Open in desktop
Expand Up @@ -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;
}
Expand Down