Skip to content

Instantly share code, notes, and snippets.

@invisiblek
Created December 6, 2016 19:22
Show Gist options
  • Save invisiblek/a1f011bc55aa5781eee2b4872d8e95ae to your computer and use it in GitHub Desktop.
Save invisiblek/a1f011bc55aa5781eee2b4872d8e95ae to your computer and use it in GitHub Desktop.
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
index afbf26d..7e9b495 100644
--- a/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@ -79,8 +79,8 @@ static struct flag_list fs_mgr_flags[] = {
{ "formattable", MF_FORMATTABLE },
{ "slotselect", MF_SLOTSELECT },
{ "nofail", MF_NOFAIL },
- { "zramstreams=",MF_ZRAMSTREAMS },
{ "latemount", MF_LATEMOUNT },
+ { "zramstreams=",MF_ZRAMSTREAMS },
{ "defaults", 0 },
{ 0, 0 },
};
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 46e79e7..ab65d40 100755
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -592,6 +592,7 @@ static int mount_fstab(const char* fstabfile, int mount_mode) {
NOTICE("ffbm mode, not start class main\n");
return 0;
}
+
return ret;
}
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 281d23e..10f78ea 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1221,13 +1221,13 @@ static int handle_open(struct fuse* fuse, struct fuse_handler* handler,
}
out.fh = ptr_to_id(h);
out.open_flags = 0;
-#if defined(FUSE_SHORTCIRCUIT) || defined(FUSE_STACKED_IO)
- out.lower_fd = h->fd;
-#elif defined FUSE_PASSTHROUGH
- out.passthrough_fd = h->fd;
-#else
- out.padding = 0;
-#endif
+ #if defined(FUSE_SHORTCIRCUIT) || defined(FUSE_STACKED_IO)
+ out.lower_fd = h->fd;
+ #elif defined FUSE_PASSTHROUGH
+ out.passthrough_fd = h->fd;
+ #else
+ out.padding = 0;
+ #endif
fuse_reply(fuse, hdr->unique, &out, sizeof(out));
return NO_STATUS;
@@ -1392,14 +1392,13 @@ static int handle_opendir(struct fuse* fuse, struct fuse_handler* handler,
}
out.fh = ptr_to_id(h);
out.open_flags = 0;
-#if defined(FUSE_SHORTCIRCUIT) || defined(FUSE_STACKED_IO)
- out.lower_fd = -1;
-#elif defined FUSE_PASSTHROUGH
- out.passthrough_fd = -1;
-#else
- out.padding = 0;
-#endif
-
+ #if defined(FUSE_SHORTCIRCUIT) || defined(FUSE_STACKED_IO)
+ out.lower_fd = -1;
+ #elif defined FUSE_PASSTHROUGH
+ out.passthrough_fd = -1;
+ #else
+ out.padding = 0;
+ #endif
fuse_reply(fuse, hdr->unique, &out, sizeof(out));
return NO_STATUS;
}
@@ -1482,15 +1481,15 @@ static int handle_init(struct fuse* fuse, struct fuse_handler* handler,
out.max_readahead = req->max_readahead;
out.flags = FUSE_ATOMIC_O_TRUNC | FUSE_BIG_WRITES;
-#ifdef FUSE_STACKED_IO
- out.flags |= FUSE_STACKED_IO;
-#endif
-#ifdef FUSE_SHORTCIRCUIT
- out.flags |= FUSE_SHORTCIRCUIT;
-#endif
-#ifdef FUSE_PASSTHROUGH
- out.flags |= FUSE_PASSTHROUGH;
-#endif
+ #ifdef FUSE_STACKED_IO
+ out.flags |= FUSE_STACKED_IO;
+ #endif
+ #ifdef FUSE_SHORTCIRCUIT
+ out.flags |= FUSE_SHORTCIRCUIT;
+ #endif
+ #ifdef FUSE_PASSTHROUGH
+ out.flags |= FUSE_PASSTHROUGH;
+ #endif
out.max_background = 32;
out.congestion_threshold = 32;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment