archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8305809: (fs) Review obsolete Linux kernel dependency on os.version (Unix kernel 2.6.39)

Browse source 
Reviewed-by: rriggs, alanb
This commit is contained in:
Brian Burkhalter 2023-04-11 16:59:11 +00:00
parent 1de772cd89
commit 475e9a7cad
1 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2023, 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
@ -32,7 +32,6 @@ import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.UserDefinedFileAttributeView;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
/**
* Linux implementation of FileStore
@ -105,18 +104,6 @@ class LinuxFileStore
throw new IOException("Mount point not found");
}
// get kernel version as a three element array {major, minor, micro}
private static int[] getKernelVersion() {
Pattern pattern = Pattern.compile("\\D+");
String[] matches = pattern.split(System.getProperty("os.version"));
int[] majorMinorMicro = new int[3];
int length = Math.min(matches.length, majorMinorMicro.length);
for (int i = 0; i < length; i++) {
majorMinorMicro[i] = Integer.parseInt(matches[i]);
}
return majorMinorMicro;
}
@Override
public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type) {
// support DosFileAttributeView and UserDefinedAttributeView if extended
@ -142,19 +129,9 @@ class LinuxFileStore
}
// user_xattr option not present but we special-case ext4 as we
// know that extended attributes are enabled by default for
// kernel version >= 2.6.39
// know that extended attributes are enabled by default
if (entry().fstype().equals("ext4")) {
if (!xattrChecked) {
// check kernel version
int[] kernelVersion = getKernelVersion();
xattrEnabled = kernelVersion[0] > 2 ||
(kernelVersion[0] == 2 && kernelVersion[1] > 6) ||
(kernelVersion[0] == 2 && kernelVersion[1] == 6 &&
kernelVersion[2] >= 39);
xattrChecked = true;
}
return xattrEnabled;
return true;
}
// not ext4 so probe mount point