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

Commit 36755637 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

fs_mgr: remove atgc mount option for zoned device 



F2FS gives EINVAL when trying to mount zoned device with atgc. This patch
allows to keep the single fstab to support legacy and zoned devices at the
same time.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
Change-Id: I47a667443e7e60cb6729553b2ca24026e21fd90d
parent 44e21ec3

fs_mgr/fs_mgr_fstab.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,12 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) { 
            if (ReadFileToString("/sys/class/block/" + arg + "/queue/zoned", &zoned) &&

            if (ReadFileToString("/sys/class/block/" + arg + "/queue/zoned", &zoned) &&

                android::base::StartsWith(zoned, "host-managed")) {

                android::base::StartsWith(zoned, "host-managed")) {

                entry->zoned_device = "/dev/block/" + arg;

                entry->zoned_device = "/dev/block/" + arg;



                // atgc in f2fs does not support a zoned device

                auto options = Split(entry->fs_options, ",");

                options.erase(std::remove(options.begin(), options.end(), "atgc"), options.end());

                entry->fs_options = android::base::Join(options, ",");

                LINFO << "Removed ATGC in fs_options as " << entry->fs_options;

            } else {

            } else {

                LWARNING << "Warning: cannot find the zoned device: " << arg;

                LWARNING << "Warning: cannot find the zoned device: " << arg;

            }

            }