diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 19:03:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 19:03:26 -0800 |
commit | d6b9cf417c62601f26fa47f97d6c0681704bf0e3 (patch) | |
tree | 2ed9a0dcd5e8b4c0d5b7cc3c4e4881f8fa83cdc5 /fs/sysv/sysv.h | |
parent | 397aa6b63ff25cee0b8ed20a6d447527c8ab0849 (diff) | |
parent | abb7c742397324f8676c5b622effdce911cd52e3 (diff) | |
download | linux-d6b9cf417c62601f26fa47f97d6c0681704bf0e3.tar.gz linux-d6b9cf417c62601f26fa47f97d6c0681704bf0e3.tar.bz2 linux-d6b9cf417c62601f26fa47f97d6c0681704bf0e3.zip |
Merge branch 'work.sysv' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull sysv updates from Al Viro:
"Fabio's 'switch to kmap_local_page()' patchset (originally after the
ext2 counterpart, with a lot of cleaning up done to it; as the matter
of fact, ext2 side is in need of similar cleanups - calling
conventions there are bloody awful).
Plus the equivalents of minix stuff..."
* 'work.sysv' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
sysv: fix handling of delete_entry and set_link failures
fs/sysv: Replace kmap() with kmap_local_page()
fs/sysv: Use dir_put_page() in sysv_rename()
fs/sysv: Change the signature of dir_get_page()
fs/sysv: Use the offset_in_page() helper
sysv: don't flush page immediately for DIRSYNC directories
Diffstat (limited to 'fs/sysv/sysv.h')
-rw-r--r-- | fs/sysv/sysv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h index 5e122a5673c1..f2c36ea42df6 100644 --- a/fs/sysv/sysv.h +++ b/fs/sysv/sysv.h @@ -148,12 +148,13 @@ extern void sysv_destroy_icache(void); /* dir.c */ +extern void dir_put_page(struct page *page, void *vaddr); extern struct sysv_dir_entry *sysv_find_entry(struct dentry *, struct page **); extern int sysv_add_link(struct dentry *, struct inode *); extern int sysv_delete_entry(struct sysv_dir_entry *, struct page *); extern int sysv_make_empty(struct inode *, struct inode *); extern int sysv_empty_dir(struct inode *); -extern void sysv_set_link(struct sysv_dir_entry *, struct page *, +extern int sysv_set_link(struct sysv_dir_entry *, struct page *, struct inode *); extern struct sysv_dir_entry *sysv_dotdot(struct inode *, struct page **); extern ino_t sysv_inode_by_name(struct dentry *); |