diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 13:11:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 13:11:44 -0700 |
| commit | b6394d6f715919c053c1450ef0d7c5e517b53764 (patch) | |
| tree | 4aa911757dd8ef6949fcb79daaaae3aa87d709e6 /fs/overlayfs | |
| parent | 3413efa8885d7a714c54c6752eaf49fd17d351c9 (diff) | |
| parent | 7c98f7cb8fda964fbc60b9307ad35e94735fa35f (diff) | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted commits that had missed the last merge window..."
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
remove call_{read,write}_iter() functions
do_dentry_open(): kill inode argument
kernel_file_open(): get rid of inode argument
get_file_rcu(): no need to check for NULL separately
fd_is_open(): move to fs/file.c
close_on_exec(): pass files_struct instead of fdtable
Diffstat (limited to 'fs/overlayfs')
| -rw-r--r-- | fs/overlayfs/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index d285d1d7baad..edc9216f6e27 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -1376,7 +1376,7 @@ int ovl_ensure_verity_loaded(struct path *datapath) * If this inode was not yet opened, the verity info hasn't been * loaded yet, so we need to do that here to force it into memory. */ - filp = kernel_file_open(datapath, O_RDONLY, inode, current_cred()); + filp = kernel_file_open(datapath, O_RDONLY, current_cred()); if (IS_ERR(filp)) return PTR_ERR(filp); fput(filp); |