diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 06:01:15 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 06:01:15 +0300 |
| commit | 397aa6b63ff25cee0b8ed20a6d447527c8ab0849 (patch) | |
| tree | b3146e8c494b00624597e400f0d2a9a8edd36d4a /fs/minix/minix.h | |
| parent | 595fa4e313fee3c0b69c10bbed6fffb803237306 (diff) | |
| parent | 2cb6a44220b974a7832d1a09630b4cee870b023a (diff) | |
| download | linux-397aa6b63ff25cee0b8ed20a6d447527c8ab0849.tar.xz | |
Merge branch 'work.minix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull minix updates from Al Viro:
"Assorted fixes - mostly Christoph's"
* 'work.minix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
minix_rename(): minix_delete_entry() might fail
minix: don't flush page immediately for DIRSYNC directories
minix: fix error handling in minix_set_link
minix: fix error handling in minix_delete_entry
minix: move releasing pages into unlink and rename
minix: make minix_new_inode() return error as ERR_PTR(-E...)
Diffstat (limited to 'fs/minix/minix.h')
| -rw-r--r-- | fs/minix/minix.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/minix/minix.h b/fs/minix/minix.h index e0b76defa85c..d493507c064f 100644 --- a/fs/minix/minix.h +++ b/fs/minix/minix.h @@ -45,7 +45,7 @@ struct minix_sb_info { extern struct inode *minix_iget(struct super_block *, unsigned long); extern struct minix_inode * minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **); extern struct minix2_inode * minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **); -extern struct inode * minix_new_inode(const struct inode *, umode_t, int *); +extern struct inode * minix_new_inode(const struct inode *, umode_t); extern void minix_free_inode(struct inode * inode); extern unsigned long minix_count_free_inodes(struct super_block *sb); extern int minix_new_block(struct inode * inode); @@ -69,7 +69,8 @@ extern int minix_add_link(struct dentry*, struct inode*); extern int minix_delete_entry(struct minix_dir_entry*, struct page*); extern int minix_make_empty(struct inode*, struct inode*); extern int minix_empty_dir(struct inode*); -extern void minix_set_link(struct minix_dir_entry*, struct page*, struct inode*); +int minix_set_link(struct minix_dir_entry *de, struct page *page, + struct inode *inode); extern struct minix_dir_entry *minix_dotdot(struct inode*, struct page**); extern ino_t minix_inode_by_name(struct dentry*); |