[haiku-commits] haiku: hrev53490 - src/system/kernel/fs

  • From: Adrien Destugues <pulkomandy@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 15 Sep 2019 12:11:52 -0400 (EDT)

hrev53490 adds 2 changesets to branch 'master'
old head: d761df9f70fd928c5423e35330e327a63e0e24f5
new head: 9d87b2c5f89ad51c34e67348112d15c163791da8
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=9d87b2c5f89a+%5Ed761df9f70fd

----------------------------------------------------------------------------

eff7baa89a2b: Revert "kernel/fs: Add missing IS_USER_ADDRESS check in 
user_vector_io."
  
  This reverts commit 2b5ebfcfd578f177968c5b923e5ccd6eb0195674.
  
  Breaks cmake.

9d87b2c5f89a: Revert "Jamrules: Include the UserBuildConfig before processing 
repositories."
  
  This reverts commit 7115cef98944c1bd53960441894010b1f60811b9.
  
  It prevents using UserBuildConfig to decide what packages gets included
  in the resulting image.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 19 insertions(+), 26 deletions(-)
Jamrules                    | 38 +++++++++++++++++++-------------------
src/system/kernel/fs/fd.cpp |  7 -------

############################################################################

Commit:      eff7baa89a2b5e735b9e9b61d72845e289042877
URL:         https://git.haiku-os.org/haiku/commit/?id=eff7baa89a2b
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Sun Sep 15 15:00:39 2019 UTC

Revert "kernel/fs: Add missing IS_USER_ADDRESS check in user_vector_io."

This reverts commit 2b5ebfcfd578f177968c5b923e5ccd6eb0195674.

Breaks cmake.

----------------------------------------------------------------------------

diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp
index db0f34b120..837d1d07a0 100644
--- a/src/system/kernel/fs/fd.cpp
+++ b/src/system/kernel/fs/fd.cpp
@@ -822,13 +822,6 @@ common_user_vector_io(int fd, off_t pos, const iovec* 
userVecs, size_t count,
 
        ssize_t bytesTransferred = 0;
        for (uint32 i = 0; i < count; i++) {
-               if (!IS_USER_ADDRESS(vecs[i].iov_base)) {
-                       status = B_BAD_ADDRESS;
-                       if (bytesTransferred == 0)
-                               return status;
-                       break;
-               }
-
                size_t length = vecs[i].iov_len;
                if (write) {
                        status = descriptor->ops->fd_write(descriptor, pos,

############################################################################

Revision:    hrev53490
Commit:      9d87b2c5f89ad51c34e67348112d15c163791da8
URL:         https://git.haiku-os.org/haiku/commit/?id=9d87b2c5f89a
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Sun Sep 15 15:33:36 2019 UTC

Revert "Jamrules: Include the UserBuildConfig before processing repositories."

This reverts commit 7115cef98944c1bd53960441894010b1f60811b9.

It prevents using UserBuildConfig to decide what packages gets included
in the resulting image.

----------------------------------------------------------------------------

diff --git a/Jamrules b/Jamrules
index 878baa93da..f242565d9c 100644
--- a/Jamrules
+++ b/Jamrules
@@ -93,6 +93,25 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) TestsRules ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) DefaultBuildProfiles ] ;
 
+# Include the repositories for this architecture.
+local repositoriesDirectory
+       = [ FDirName $(HAIKU_BUILD_RULES_DIR) repositories ] ;
+local repositories = HaikuPorts ;
+if $(HAIKU_BUILD_TYPE) = bootstrap {
+       repositories = HaikuPortsCross ;
+}
+
+local repository ;
+for repository in $(repositories) {
+       local repositoryDirectory
+               = [ FDirName $(repositoriesDirectory) $(repository) ] ;
+       local file = [ Glob $(repositoryDirectory) : $(HAIKU_PACKAGING_ARCH) ] ;
+       if $(file) {
+               HAIKU_REPOSITORY_JAMFILE = $(file) ;
+               include $(file) ;
+       }
+}
+
 # Declare no-op user-overridable build rules.
 rule UserBuildConfigRulePostBuildTargets       { }
 rule UserBuildConfigRulePreImage                       { }
@@ -114,25 +133,6 @@ if ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
        }
 }
 
-# Include the repositories for this architecture.
-local repositoriesDirectory
-       = [ FDirName $(HAIKU_BUILD_RULES_DIR) repositories ] ;
-local repositories = HaikuPorts ;
-if $(HAIKU_BUILD_TYPE) = bootstrap {
-       repositories = HaikuPortsCross ;
-}
-
-local repository ;
-for repository in $(repositories) {
-       local repositoryDirectory
-               = [ FDirName $(repositoriesDirectory) $(repository) ] ;
-       local file = [ Glob $(repositoryDirectory) : $(HAIKU_PACKAGING_ARCH) ] ;
-       if $(file) {
-               HAIKU_REPOSITORY_JAMFILE = $(file) ;
-               include $(file) ;
-       }
-}
-
 DefineDefaultBuildProfiles ;
 
 PrepareConfigVariables ;


Other related posts: