Skip to content
  • Arnaldo Carvalho de Melo's avatar
    tools headers uapi: Sync linux/fs.h with the kernel sources · 0ae40612
    Arnaldo Carvalho de Melo authored
    To pick the changes from:
    
      78a1b96b ("fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS ioctl")
      23c688b5 ("fscrypt: allow unprivileged users to add/remove keys for v2 policies")
      5dae460c ("fscrypt: v2 encryption policy support")
      5a7e2992 ("fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl")
      b1c0ec35 ("fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl")
      22d94f49 ("fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl")
      3b6df59b ("fscrypt: use FSCRYPT_* definitions, not FS_*")
      2336d0de ("fscrypt: use FSCRYPT_ prefix for uapi constants")
      7af0ab0d ("fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h>")
    
    That don't trigger any changes in tooling, as it so far is used only
    for:
    
      $ grep -l 'fs\.h' tools/perf/trace/beauty/*.sh | xargs grep regex=
      tools/perf/trace/beauty/rename_flags.sh:regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+RENAME_([[:alnum:]_]+)[[:space:]]+\(1[[:space:]]*<<[[:space:]]*([[:xdigit:]]+)[[:space:]]*\)[[:space:]]*.*'
      tools/perf/trace/beauty/sync_file_range.sh:regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+SYNC_FILE_RANGE_([[:alnum:]_]+)[[:space:]]+([[:xdigit:]]+)[[:space:]]*.*'
      tools/perf/trace/beauty/usbdevfs_ioctl.sh:regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
      tools/perf/trace/beauty/usbdevfs_ioctl.sh:regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
      $
    
    This silences this perf build warning:
    
      Warning: Kernel ABI header at 'tools/include/uapi/linux/fs.h' differs from latest version at 'include/uapi/linux/fs.h'
      diff -u tools/include/uapi/linux/fs.h include/uapi/linux/fs.h
    
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Eric Biggers <ebiggers@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: https://lkml.kernel.org/n/tip-44g48exl9br9ba0t64chqb4i@git.kernel.org
    
    
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    0ae40612