Skip to content

Commit

Permalink
Stop passing "force" option when invoking cros-disks's Unmount method.
Browse files Browse the repository at this point in the history
cros-disks's Unmount method now ignores the "force" option (CL:388592,
chromium:646224). This CL updates CrosDisksClient to stop passing the
"force" option when invoking the Unmount method.

BUG=700548
TEST=chromos_unittests

Review-Url: https://codereview.chromium.org/2743113003
Cr-Commit-Position: refs/heads/master@{#456230}
  • Loading branch information
cbchan authored and Commit bot committed Mar 11, 2017
1 parent 379e35f commit 8bcaea1
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions chromeos/dbus/cros_disks_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ const char kReadWriteOption[] = "rw";
const char kRemountOption[] = "remount";
const char kMountLabelOption[] = "mountlabel";

const char* kDefaultUnmountOptions[] = {
"force",
};

const char kLazyUnmountOption[] = "lazy";

// Checks if retrieved media type is in boundaries of DeviceMediaType.
Expand Down Expand Up @@ -133,9 +129,7 @@ class CrosDisksClientImpl : public CrosDisksClient {
dbus::MessageWriter writer(&method_call);
writer.AppendString(device_path);

std::vector<std::string> unmount_options(
kDefaultUnmountOptions,
kDefaultUnmountOptions + arraysize(kDefaultUnmountOptions));
std::vector<std::string> unmount_options;
if (options == UNMOUNT_OPTIONS_LAZY)
unmount_options.push_back(kLazyUnmountOption);

Expand Down

0 comments on commit 8bcaea1

Please sign in to comment.