Skip to content

Commit afdf0fb

Browse files
committed
Merge tag 'vfs-6.19-rc1.fs_header' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull fs header updates from Christian Brauner: "This contains initial work to start splitting up fs.h. Begin the long-overdue work of splitting up the monolithic fs.h header. The header has grown to over 3000 lines and includes types and functions for many different subsystems, making it difficult to navigate and causing excessive compilation dependencies. This series introduces new focused headers for superblock-related code: - Rename fs_types.h to fs_dirent.h to better reflect its actual content (directory entry types) - Add fs/super_types.h containing superblock type definitions - Add fs/super.h containing superblock function declarations This is the first step in a longer effort to modularize the VFS headers. Cleanups: - Inode Field Layout Optimization (Mateusz Guzik) Move inode fields used during fast path lookup closer together to improve cache locality during path resolution. - current_umask() Optimization (Mateusz Guzik) Inline current_umask() and move it to fs_struct.h. This improves performance by avoiding function call overhead for this frequently-used function, and places it in a more appropriate header since it operates on fs_struct" * tag 'vfs-6.19-rc1.fs_header' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: fs: move inode fields used during fast path lookup closer together fs: inline current_umask() and move it to fs_struct.h fs: add fs/super.h header fs: add fs/super_types.h header fs: rename fs_types.h to fs_dirent.h
2 parents 1d18101 + dca3aa6 commit afdf0fb

22 files changed

Lines changed: 601 additions & 543 deletions

File tree

fs/9p/acl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/module.h>
88
#include <linux/fs.h>
9+
#include <linux/fs_struct.h>
910
#include <net/9p/9p.h>
1011
#include <net/9p/client.h>
1112
#include <linux/slab.h>

fs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ obj-y := open.o read_write.o file_table.o super.o \
1414
seq_file.o xattr.o libfs.o fs-writeback.o \
1515
pnode.o splice.o sync.o utimes.o d_path.o \
1616
stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
17-
fs_types.o fs_context.o fs_parser.o fsopen.o init.o \
17+
fs_dirent.o fs_context.o fs_parser.o fsopen.o init.o \
1818
kernel_read_file.o mnt_idmapping.o remap_range.o pidfs.o \
1919
file_attr.o
2020

fs/btrfs/inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/blk-cgroup.h>
1010
#include <linux/file.h>
1111
#include <linux/fs.h>
12+
#include <linux/fs_struct.h>
1213
#include <linux/pagemap.h>
1314
#include <linux/highmem.h>
1415
#include <linux/time.h>

fs/f2fs/acl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*
1010
* Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>
1111
*/
12+
#include <linux/fs_struct.h>
1213
#include <linux/f2fs_fs.h>
1314
#include "f2fs.h"
1415
#include "xattr.h"

fs/fat/inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/unaligned.h>
2323
#include <linux/random.h>
2424
#include <linux/iversion.h>
25+
#include <linux/fs_struct.h>
2526
#include "fat.h"
2627

2728
#ifndef CONFIG_FAT_DEFAULT_IOCHARSET

fs/fs_types.c renamed to fs/fs_dirent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
#include <linux/fs.h>
2+
#include <linux/fs_dirent.h>
33
#include <linux/export.h>
44

55
/*

fs/fs_struct.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ int unshare_fs_struct(void)
146146
}
147147
EXPORT_SYMBOL_GPL(unshare_fs_struct);
148148

149-
int current_umask(void)
150-
{
151-
return current->fs->umask;
152-
}
153-
EXPORT_SYMBOL(current_umask);
154-
155149
/* to be mentioned only in INIT_TASK */
156150
struct fs_struct init_fs = {
157151
.users = 1,

fs/hfsplus/options.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/string.h>
1313
#include <linux/kernel.h>
1414
#include <linux/sched.h>
15+
#include <linux/fs_struct.h>
1516
#include <linux/fs_context.h>
1617
#include <linux/fs_parser.h>
1718
#include <linux/nls.h>

fs/hpfs/super.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "hpfs_fn.h"
1111
#include <linux/module.h>
12+
#include <linux/fs_struct.h>
1213
#include <linux/fs_context.h>
1314
#include <linux/fs_parser.h>
1415
#include <linux/init.h>

fs/nilfs2/nilfs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/buffer_head.h>
1515
#include <linux/spinlock.h>
1616
#include <linux/blkdev.h>
17+
#include <linux/fs_struct.h>
1718
#include <linux/nilfs2_api.h>
1819
#include <linux/nilfs2_ondisk.h>
1920
#include "the_nilfs.h"

0 commit comments

Comments
 (0)