src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 70,80 ****
  
  void ZBackingPath::get_mountpoints(const char* filesystem, ZArray<char*>* mountpoints) const {
    FILE* fd = fopen(PROC_SELF_MOUNTINFO, "r");
    if (fd == NULL) {
      ZErrno err;
!     log_error(gc, init)("Failed to open %s: %s", PROC_SELF_MOUNTINFO, err.to_string());
      return;
    }
  
    char* line = NULL;
    size_t length = 0;
--- 70,80 ----
  
  void ZBackingPath::get_mountpoints(const char* filesystem, ZArray<char*>* mountpoints) const {
    FILE* fd = fopen(PROC_SELF_MOUNTINFO, "r");
    if (fd == NULL) {
      ZErrno err;
!     log_error(gc)("Failed to open %s: %s", PROC_SELF_MOUNTINFO, err.to_string());
      return;
    }
  
    char* line = NULL;
    size_t length = 0;
*** 111,124 ****
        }
      }
    }
  
    // Preferred mount point not found
!   log_error(gc, init)("More than one %s filesystem found:", filesystem);
    ZArrayIterator<char*> iter2(mountpoints);
    for (char* mountpoint; iter2.next(&mountpoint);) {
!     log_error(gc, init)("  %s", mountpoint);
    }
  
    return NULL;
  }
  
--- 111,124 ----
        }
      }
    }
  
    // Preferred mount point not found
!   log_error(gc)("More than one %s filesystem found:", filesystem);
    ZArrayIterator<char*> iter2(mountpoints);
    for (char* mountpoint; iter2.next(&mountpoint);) {
!     log_error(gc)("  %s", mountpoint);
    }
  
    return NULL;
  }
  
*** 128,138 ****
  
    get_mountpoints(filesystem, &mountpoints);
  
    if (mountpoints.size() == 0) {
      // No mount point found
!     log_error(gc, init)("Failed to find an accessible %s filesystem", filesystem);
    } else if (mountpoints.size() == 1) {
      // One mount point found
      path = strdup(mountpoints.at(0));
    } else {
      // More than one mount point found
--- 128,138 ----
  
    get_mountpoints(filesystem, &mountpoints);
  
    if (mountpoints.size() == 0) {
      // No mount point found
!     log_error(gc)("Failed to find an accessible %s filesystem", filesystem);
    } else if (mountpoints.size() == 1) {
      // One mount point found
      path = strdup(mountpoints.at(0));
    } else {
      // More than one mount point found