Commit a760b03d authored by Al Viro's avatar Al Viro
Browse files

affs: propagate umode_t 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a5e7ed32

fs/affs/affs.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ extern int affs_remove_header(struct dentry *dentry); 
extern u32	affs_checksum_block(struct super_block *sb, struct buffer_head *bh);

extern void	affs_fix_checksum(struct super_block *sb, struct buffer_head *bh);

extern void	secs_to_datestamp(time_t secs, struct affs_date *ds);

extern mode_t	prot_to_mode(u32 prot);

extern umode_t	prot_to_mode(u32 prot);

extern void	mode_to_prot(struct inode *inode);

extern void	affs_error(struct super_block *sb, const char *function, const char *fmt, ...);

extern void	affs_warning(struct super_block *sb, const char *function, const char *fmt, ...);

fs/affs/amigaffs.c

+3 −3
Original line number Diff line number Diff line
@@ -390,10 +390,10 @@ secs_to_datestamp(time_t secs, struct affs_date *ds) 
	ds->ticks = cpu_to_be32(secs * 50);

}



mode_t

umode_t

prot_to_mode(u32 prot)

{

	int mode = 0;

	umode_t mode = 0;



	if (!(prot & FIBF_NOWRITE))

		mode |= S_IWUSR;
@@ -421,7 +421,7 @@ void 
mode_to_prot(struct inode *inode)

{

	u32 prot = AFFS_I(inode)->i_protect;

	mode_t mode = inode->i_mode;

	umode_t mode = inode->i_mode;



	if (!(mode & S_IXUSR))

		prot |= FIBF_NOEXECUTE;