Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f3b627 authored by David Anderson's avatar David Anderson
Browse files

fs_mgr: Split fs_mgr_overlayfs into two separate files. 

One of the paint points for fs_mgr_overlayfs is that mounting and
scratch management code are somewhat unrelated but very intertwined in
the same file.

Split it into two files: fs_mgr_overlayfs_mount, which is only for
mount-related code, and fs_mgr_overlayfs_control, which is only for
setup/teardown code.

The code removed from fs_mgr_overlayfs_control.cpp is code that moved
to fs_mgr_overlayfs_mount.cpp.

This converts a bunch of functions to "static", and splits
fs_mgr_priv_overlayfs.h into two new files (fs_mgr_overlayfs_mount.h and
fs_mgr_overlayfs_control.h).

Bug: N/A
Test: remount
Change-Id: I83da43652b4787f344da75a1d30177df1d7f63b2
parent ed2618bc

fs_mgr/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -70,8 +70,9 @@ cc_defaults { 
        "fs_mgr.cpp",

        "fs_mgr_format.cpp",

        "fs_mgr_dm_linear.cpp",

        "fs_mgr_overlayfs.cpp",

        "fs_mgr_roots.cpp",

        "fs_mgr_overlayfs_control.cpp",

        "fs_mgr_overlayfs_mount.cpp",

        "fs_mgr_vendor_overlay.cpp",

        ":libfiemap_srcs",

    ],

fs_mgr/fs_mgr_overlayfs.cpp→fs_mgr/fs_mgr_overlayfs_control.cpp

+12 −657

File changed and moved.

Preview size limit exceeded, changes collapsed.

fs_mgr/fs_mgr_priv_overlayfs.h→fs_mgr/fs_mgr_overlayfs_control.h

+14 −19
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.

 */

// Copyright (C) 2023 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.



#pragma once
@@ -20,11 +18,8 @@ 


#include <fstab/fstab.h>



bool fs_mgr_overlayfs_already_mounted(const std::string& mount_point, bool overlay_only = true);

bool fs_mgr_wants_overlayfs(android::fs_mgr::FstabEntry* entry);

android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);



// If "mount_point" is non-null, set up exactly one overlay.

//

// If "mount_point" is null, setup any overlays.

//

// If |want_reboot| is non-null, and a reboot is needed to apply overlays, then

fs_mgr/fs_mgr_overlayfs_mount.cpp

0 → 100644
+802 −0

File added.

Preview size limit exceeded, changes collapsed.

fs_mgr/fs_mgr_overlayfs_mount.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.

 */



#pragma once



#include <string>



#include <fstab/fstab.h>



bool fs_mgr_overlayfs_already_mounted(const std::string& mount_point, bool overlay_only = true);

bool fs_mgr_wants_overlayfs(android::fs_mgr::FstabEntry* entry);

android::fs_mgr::Fstab fs_mgr_overlayfs_candidate_list(const android::fs_mgr::Fstab& fstab);



#if ALLOW_ADBD_DISABLE_VERITY

constexpr bool kAllowOverlayfs = true;

#else

constexpr bool kAllowOverlayfs = false;

#endif



class AutoSetFsCreateCon final {

  public:

    AutoSetFsCreateCon() {}

    AutoSetFsCreateCon(const std::string& context) { Set(context); }

    ~AutoSetFsCreateCon() { Restore(); }



    bool Ok() const { return ok_; }

    bool Set(const std::string& context);

    bool Restore();



  private:

    bool ok_ = false;

    bool restored_ = false;

};



constexpr auto kScratchMountPoint = "/mnt/scratch";

constexpr char kOverlayfsFileContext[] = "u:object_r:overlayfs_file:s0";



constexpr auto kUpperName = "upper";

constexpr auto kWorkName = "work";

constexpr auto kOverlayTopDir = "/overlay";



bool fs_mgr_is_dsu_running();

bool fs_mgr_in_recovery();

bool fs_mgr_access(const std::string& path);

bool fs_mgr_rw_access(const std::string& path);

bool fs_mgr_filesystem_has_space(const std::string& mount_point);

const std::string fs_mgr_mount_point(const std::string& mount_point);

bool fs_mgr_overlayfs_umount_scratch();

std::vector<const std::string> OverlayMountPoints();