[PATCH 2/2] minix: modernize function declarations in minix.h

[Jeremy Bingham]

The function prototypes in minix.h were a mix of current and historic
standards. Some functions had arguments with types and names while
others had just the types. Some functions were also still prefixed with
extern, and there were a few uses of bare 'unsigned' still as well.

This brings fs/minix/minix.h up to speed with the current formatting
standards. Function declarations are consistent with types and names
both declared, and the bare 'unsigned' variables are now declared as
'unsigned int'.

There are no functional changes with this patch.

Signed-off-by: Jeremy Bingham <jbingham@xxxxxxxxx>
---
 fs/minix/itree_v1.c |  2 +-
 fs/minix/itree_v2.c |  2 +-
 fs/minix/minix.h    | 55 +++++++++++++++++++++++++--------------------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c
index 1fed906042aa..3433f50e2de2 100644
--- a/fs/minix/itree_v1.c
+++ b/fs/minix/itree_v1.c
@@ -61,7 +61,7 @@ void V1_minix_truncate(struct inode * inode)
 	truncate(inode);
 }
 
-unsigned V1_minix_blocks(loff_t size, struct super_block *sb)
+unsigned int V1_minix_blocks(loff_t size, struct super_block *sb)
 {
 	return nblocks(size, sb);
 }
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c
index 9d00f31a2d9d..a18b6e1f9ed5 100644
--- a/fs/minix/itree_v2.c
+++ b/fs/minix/itree_v2.c
@@ -69,7 +69,7 @@ void V2_minix_truncate(struct inode * inode)
 	truncate(inode);
 }
 
-unsigned V2_minix_blocks(loff_t size, struct super_block *sb)
+unsigned int V2_minix_blocks(loff_t size, struct super_block *sb)
 {
 	return nblocks(size, sb);
 }
diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index 972a71c5b481..d124145850e9 100644
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -67,39 +67,44 @@ struct minix_sb_info {
 void __minix_error_inode(struct inode *inode, const char *function,
 			 unsigned int line, const char *fmt, ...);
 
-struct inode *minix_iget(struct super_block *, unsigned long);
-struct minix_inode *minix_V1_raw_inode(struct super_block *, ino_t, struct buffer_head **);
-struct minix2_inode *minix_V2_raw_inode(struct super_block *, ino_t, struct buffer_head **);
-struct inode *minix_new_inode(const struct inode *, umode_t);
+struct inode *minix_iget(struct super_block *sb, unsigned long ino);
+struct minix_inode *minix_V1_raw_inode(struct super_block *sb, ino_t ino,
+		struct buffer_head **bh);
+struct minix2_inode *minix_V2_raw_inode(struct super_block *sb, ino_t ino,
+		struct buffer_head **bh);
+struct inode *minix_new_inode(const struct inode *dir, umode_t mode);
 void minix_free_inode(struct inode *inode);
 unsigned long minix_count_free_inodes(struct super_block *sb);
 int minix_new_block(struct inode *inode);
 void minix_free_block(struct inode *inode, unsigned long block);
 unsigned long minix_count_free_blocks(struct super_block *sb);
-int minix_getattr(struct mnt_idmap *, const struct path *,
-		struct kstat *, u32, unsigned int);
+int minix_getattr(struct mnt_idmap *idmap, const struct path *path,
+		struct kstat *stat, u32 request_mask, unsigned int flags);
 int minix_prepare_chunk(struct folio *folio, loff_t pos, unsigned len);
 struct mapping_metadata_bhs *minix_get_metadata_bhs(struct inode *inode);
 int minix_fsync(struct file *file, loff_t start, loff_t end, int datasync);
 
-extern void V1_minix_truncate(struct inode *);
-extern void V2_minix_truncate(struct inode *);
-extern void minix_truncate(struct inode *);
-extern void minix_set_inode(struct inode *, dev_t);
-extern int V1_minix_get_block(struct inode *, long, struct buffer_head *, int);
-extern int V2_minix_get_block(struct inode *, long, struct buffer_head *, int);
-extern unsigned V1_minix_blocks(loff_t, struct super_block *);
-extern unsigned V2_minix_blocks(loff_t, struct super_block *);
-
-struct minix_dir_entry *minix_find_entry(struct dentry *, struct folio **);
-int minix_add_link(struct dentry*, struct inode*);
-int minix_delete_entry(struct minix_dir_entry *, struct folio *);
-int minix_make_empty(struct inode*, struct inode*);
-int minix_empty_dir(struct inode*);
+void V1_minix_truncate(struct inode *inode);
+void V2_minix_truncate(struct inode *inode);
+void minix_truncate(struct inode *inode);
+void minix_set_inode(struct inode *inode, dev_t rdev);
+int V1_minix_get_block(struct inode *inode, long block,
+		struct buffer_head *bh, int create);
+int V2_minix_get_block(struct inode *inode, long block,
+		struct buffer_head *bh, int create);
+unsigned int V1_minix_blocks(loff_t size, struct super_block *sb);
+unsigned int V2_minix_blocks(loff_t size, struct super_block *sb);
+
+struct minix_dir_entry *minix_find_entry(struct dentry *dentry,
+	struct folio **foliop);
+int minix_add_link(struct dentry *dentry, struct inode *inode);
+int minix_delete_entry(struct minix_dir_entry *de, struct folio *folio);
+int minix_make_empty(struct inode *inode, struct inode *dir);
+int minix_empty_dir(struct inode *inode);
 int minix_set_link(struct minix_dir_entry *de, struct folio *folio,
 		struct inode *inode);
-struct minix_dir_entry *minix_dotdot(struct inode*, struct folio **);
-ino_t minix_inode_by_name(struct dentry*);
+struct minix_dir_entry *minix_dotdot(struct inode *dir, struct folio **foliop);
+ino_t minix_inode_by_name(struct dentry *dentry);
 
 extern const struct inode_operations minix_file_inode_operations;
 extern const struct inode_operations minix_dir_inode_operations;
@@ -116,7 +121,8 @@ static inline struct minix_inode_info *minix_i(struct inode *inode)
 	return container_of(inode, struct minix_inode_info, vfs_inode);
 }
 
-static inline unsigned minix_blocks_needed(unsigned bits, unsigned blocksize)
+static inline unsigned int minix_blocks_needed(unsigned int bits,
+		unsigned int blocksize)
 {
 	return DIV_ROUND_UP(bits, blocksize * 8);
 }
@@ -150,7 +156,8 @@ static inline unsigned minix_blocks_needed(unsigned bits, unsigned blocksize)
  * big-endian 16bit indexed bitmaps
  */
 
-static inline int minix_find_first_zero_bit(const void *vaddr, unsigned size)
+static inline int minix_find_first_zero_bit(const void *vaddr,
+		unsigned int size)
 {
 	const unsigned short *p = vaddr, *addr = vaddr;
 	unsigned short num;
-- 
2.47.3