From <suhelmehta@xxxxxxxxxxx>:
suhelmehta@xxxxxxxxxxx has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2374 ;)
Change subject: Jamfile content is now in alphabetic order
......................................................................
Jamfile content is now in alphabetic order
Remove UUID code
UFS does not use UUID, hence removed from code.
Add standard copyright header
Add standard copyright header as per the coding-guidlines
---
M src/add-ons/kernel/file_systems/Jamfile
M src/add-ons/kernel/file_systems/ufs2/Jamfile
M src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
M src/add-ons/kernel/file_systems/ufs2/system_dependencies.h
M src/tests/add-ons/kernel/file_systems/Jamfile
5 files changed, 11 insertions(+), 14 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/74/2374/1
diff --git a/src/add-ons/kernel/file_systems/Jamfile
b/src/add-ons/kernel/file_systems/Jamfile
index 22053c6..135aeb4 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -18,8 +18,8 @@
SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems reiserfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems ufs2 ;
SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems xfs ;
-SubInclude HAIKU_TOP src add-ons kernel file_systems ufs2 ;
SubInclude HAIKU_TOP src add-ons kernel file_systems layers ;
diff --git a/src/add-ons/kernel/file_systems/ufs2/Jamfile
b/src/add-ons/kernel/file_systems/ufs2/Jamfile
index 83b3568..7856241 100644
--- a/src/add-ons/kernel/file_systems/ufs2/Jamfile
+++ b/src/add-ons/kernel/file_systems/ufs2/Jamfile
@@ -17,17 +17,10 @@
DEFINES += DEBUG_APP="\\\"ufs2\\\"" ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs uuid ] : true ;
-
local ufs2Sources =
kernel_cpp.cpp
kernel_interface.cpp
;
-KernelAddon ufs2 :
- $(ufs2Sources)
- :
- libuuid_kernel.a
-;
SEARCH on [ FGristFiles $(ufs2Sources) ]
= [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems ufs2 ] ;
diff --git a/src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
b/src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
index 25e4531..e53d93d 100644
--- a/src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2020 Suhel Mehta, mehtasuhel@xxxxxxxxx
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
#include "system_dependencies.h"
#ifdef TRACE_ufs2
@@ -513,7 +517,7 @@
},
"ufs2", // short_name
- "ufs2 File System", // pretty_name
+ "Unix Filesystem 2", // pretty_name
// DDM flags
0| B_DISK_SYSTEM_SUPPORTS_INITIALIZING
|B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
diff --git a/src/add-ons/kernel/file_systems/ufs2/system_dependencies.h
b/src/add-ons/kernel/file_systems/ufs2/system_dependencies.h
index dfbb4e5..5e5093f 100644
--- a/src/add-ons/kernel/file_systems/ufs2/system_dependencies.h
+++ b/src/add-ons/kernel/file_systems/ufs2/system_dependencies.h
@@ -1,4 +1,7 @@
-
+/*
+ * Copyright 2020 Suhel Mehta, mehtasuhel@xxxxxxxxx
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
#ifndef _SYSTE_DEPENDENCIES_H
#define _SYSTEM_DEPENDENCIES_H
@@ -12,9 +15,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-typedef unsigned char uuid_t[16];
-void uuid_generate(uuid_t out);
#ifdef __cplusplus
}
#endif
@@ -29,7 +30,6 @@
#include <util/Stack.h>
#include <ByteOrder.h>
-#include <uuid.h>
#include <tracing.h>
#include <driver_settings.h>
diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile
b/src/tests/add-ons/kernel/file_systems/Jamfile
index 02abb22..e4f07a7 100644
--- a/src/tests/add-ons/kernel/file_systems/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -9,6 +9,6 @@
HaikuSubInclude random_file_actions ;
HaikuSubInclude random_read ;
HaikuSubInclude udf ;
+HaikuSubInclude ufs2 ;
HaikuSubInclude userlandfs ;
HaikuSubInclude xfs ;
-HaikuSubInclude ufs2 ;
--
To view, visit https://review.haiku-os.org/c/haiku/+/2374
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Id25efce3349ca04f9664996f7a97f1459dbb9054
Gerrit-Change-Number: 2374
Gerrit-PatchSet: 1
Gerrit-Owner: suhelmehta@xxxxxxxxxxx
Gerrit-MessageType: newchange
