am 32e20905: am bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev
* commit '32e2090562552041a15e73afcce1e9948d9eb634':
Clean up ASEC unmounting on physical storage.
diff --git a/Android.mk b/Android.mk
index cecab1e..2625b29 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,6 @@
Loop.cpp \
Devmapper.cpp \
ResponseCode.cpp \
- Xwarp.cpp \
VoldUtil.c \
fstrim.c \
cryptfs.c
diff --git a/CommandListener.cpp b/CommandListener.cpp
index 049d42c..0ac656b 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -34,7 +34,6 @@
#include "VolumeManager.h"
#include "ResponseCode.h"
#include "Process.h"
-#include "Xwarp.h"
#include "Loop.h"
#include "Devmapper.h"
#include "cryptfs.h"
@@ -49,7 +48,6 @@
registerCmd(new AsecCmd());
registerCmd(new ObbCmd());
registerCmd(new StorageCmd());
- registerCmd(new XwarpCmd());
registerCmd(new CryptfsCmd());
registerCmd(new FstrimCmd());
}
@@ -506,49 +504,6 @@
return 0;
}
-CommandListener::XwarpCmd::XwarpCmd() :
- VoldCommand("xwarp") {
-}
-
-int CommandListener::XwarpCmd::runCommand(SocketClient *cli,
- int argc, char **argv) {
- if (argc < 2) {
- cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing Argument", false);
- return 0;
- }
-
- if (!strcmp(argv[1], "enable")) {
- if (Xwarp::enable()) {
- cli->sendMsg(ResponseCode::OperationFailed, "Failed to enable xwarp", true);
- return 0;
- }
-
- cli->sendMsg(ResponseCode::CommandOkay, "Xwarp mirroring started", false);
- } else if (!strcmp(argv[1], "disable")) {
- if (Xwarp::disable()) {
- cli->sendMsg(ResponseCode::OperationFailed, "Failed to disable xwarp", true);
- return 0;
- }
-
- cli->sendMsg(ResponseCode::CommandOkay, "Xwarp disabled", false);
- } else if (!strcmp(argv[1], "status")) {
- char msg[255];
- bool r;
- unsigned mirrorPos, maxSize;
-
- if (Xwarp::status(&r, &mirrorPos, &maxSize)) {
- cli->sendMsg(ResponseCode::OperationFailed, "Failed to get xwarp status", true);
- return 0;
- }
- snprintf(msg, sizeof(msg), "%s %u %u", (r ? "ready" : "not-ready"), mirrorPos, maxSize);
- cli->sendMsg(ResponseCode::XwarpStatusResult, msg, false);
- } else {
- cli->sendMsg(ResponseCode::CommandSyntaxError, "Unknown storage cmd", false);
- }
-
- return 0;
-}
-
CommandListener::CryptfsCmd::CryptfsCmd() :
VoldCommand("cryptfs") {
}
diff --git a/CommandListener.h b/CommandListener.h
index 8cc5b09..0bd51d2 100644
--- a/CommandListener.h
+++ b/CommandListener.h
@@ -65,13 +65,6 @@
int runCommand(SocketClient *c, int argc, char ** argv);
};
- class XwarpCmd : public VoldCommand {
- public:
- XwarpCmd();
- virtual ~XwarpCmd() {}
- int runCommand(SocketClient *c, int argc, char ** argv);
- };
-
class CryptfsCmd : public VoldCommand {
public:
CryptfsCmd();
diff --git a/ResponseCode.h b/ResponseCode.h
index 5e4c6fa..26ebfcd 100644
--- a/ResponseCode.h
+++ b/ResponseCode.h
@@ -33,7 +33,6 @@
static const int ShareStatusResult = 210;
static const int AsecPathResult = 211;
static const int ShareEnabledResult = 212;
- static const int XwarpStatusResult = 213;
// 400 series - The command was accepted but the requested action
// did not take place.
diff --git a/Xwarp.cpp b/Xwarp.cpp
deleted file mode 100644
index 2973ff8..0000000
--- a/Xwarp.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#define LOG_TAG "Vold"
-
-#include <cutils/log.h>
-
-#include "Xwarp.h"
-const char *Xwarp::XWARP_BACKINGFILE = "/mnt/secure/asec/xwarp.img";
-const char *Xwarp::XWARP_CFG = "/sys/fs/yaffs/mtd3/xwarp-backing-store";
-const char *Xwarp::XWARP_READY = "/sys/fs/yaffs/mtd3/xwarp-ready";
-const char *Xwarp::XWARP_MIRROR_STATUS = "/sys/fs/yaffs/mtd3/xwarp-mirror";
-
-int Xwarp::enable() {
- return doEnableDisable(true);
-}
-
-int Xwarp::disable() {
- return doEnableDisable(false);
-}
-
-int Xwarp::status(bool *ready, unsigned *mirrorPos, unsigned *maxSize) {
- FILE *fp;
-
- *ready = false;
- *mirrorPos = 0;
- *maxSize = 0;
- if (!(fp = fopen(XWARP_READY, "r"))) {
- return -1;
- }
-
- fscanf(fp, "%d", (int *) ready);
- fclose(fp);
-
- if (!(fp = fopen(XWARP_MIRROR_STATUS, "r"))) {
- return -1;
- }
-
- fscanf(fp, "%u %u", mirrorPos, maxSize);
- fclose(fp);
- return 0;
-}
-
-int Xwarp::doEnableDisable(bool enable) {
- const char *tmp;
- int fd = open(XWARP_CFG, O_WRONLY);
-
- if (fd < 0)
- return -1;
-
- tmp = (enable ? XWARP_BACKINGFILE : "");
-
- if (write(fd, tmp, strlen(tmp)+1) < 0) {
- SLOGE("Failed to write xwarp cfg (%s)", strerror(errno));
- close(fd);
- return -1;
- }
-
- close(fd);
- return 0;
-}
diff --git a/Xwarp.h b/Xwarp.h
deleted file mode 100644
index 918a843..0000000
--- a/Xwarp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _XWARP_H
-#define _XWARP_H
-
-#include <unistd.h>
-
-class Xwarp {
- static const char *XWARP_BACKINGFILE;
- static const char *XWARP_CFG;
- static const char *XWARP_READY;
- static const char *XWARP_MIRROR_STATUS;
-
-public:
- static int enable();
- static int disable();
- static int status(bool *ready, unsigned *mirrorPos, unsigned *maxSize);
-
-private:
- static int doEnableDisable(bool enable);
-};
-
-#endif