Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1618208 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/affs: add prefix to some functions 

secs_to_datestamp(time64_t secs, struct affs_date *ds);
prot_to_mode(u32 prot);
mode_to_prot(struct inode *inode);

were declared without affs_ prefix

Link: http://lkml.kernel.org/r/20170109191208.6085-6-fabf@skynet.be


Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1bafd6f1

fs/affs/affs.h

+3 −3
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ extern int affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh); 
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(time64_t secs, struct affs_date *ds);

extern umode_t	prot_to_mode(u32 prot);

extern void	mode_to_prot(struct inode *inode);

extern void	affs_secs_to_datestamp(time64_t secs, struct affs_date *ds);

extern umode_t	affs_prot_to_mode(u32 prot);

extern void	affs_mode_to_prot(struct inode *inode);

__printf(3, 4)

extern void	affs_error(struct super_block *sb, const char *function,

			   const char *fmt, ...);

fs/affs/amigaffs.c

+3 −3
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ affs_fix_checksum(struct super_block *sb, struct buffer_head *bh) 
}



void

secs_to_datestamp(time64_t secs, struct affs_date *ds)

affs_secs_to_datestamp(time64_t secs, struct affs_date *ds)

{

	u32	 days;

	u32	 minute;
@@ -386,7 +386,7 @@ secs_to_datestamp(time64_t secs, struct affs_date *ds) 
}



umode_t

prot_to_mode(u32 prot)

affs_prot_to_mode(u32 prot)

{

	umode_t mode = 0;
@@ -413,7 +413,7 @@ prot_to_mode(u32 prot) 
}



void

mode_to_prot(struct inode *inode)

affs_mode_to_prot(struct inode *inode)

{

	u32 prot = AFFS_I(inode)->i_protect;

	umode_t mode = inode->i_mode;

fs/affs/inode.c

+5 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) 
	if (affs_test_opt(sbi->s_flags, SF_SETMODE))

		inode->i_mode = sbi->s_mode;

	else

		inode->i_mode = prot_to_mode(prot);

		inode->i_mode = affs_prot_to_mode(prot);



	id = be16_to_cpu(tail->uid);

	if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETUID))
@@ -184,11 +184,12 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc) 
	}

	tail = AFFS_TAIL(sb, bh);

	if (tail->stype == cpu_to_be32(ST_ROOT)) {

		secs_to_datestamp(inode->i_mtime.tv_sec,&AFFS_ROOT_TAIL(sb, bh)->root_change);

		affs_secs_to_datestamp(inode->i_mtime.tv_sec,

				       &AFFS_ROOT_TAIL(sb, bh)->root_change);

	} else {

		tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect);

		tail->size = cpu_to_be32(inode->i_size);

		secs_to_datestamp(inode->i_mtime.tv_sec,&tail->change);

		affs_secs_to_datestamp(inode->i_mtime.tv_sec, &tail->change);

		if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {

			uid = i_uid_read(inode);

			gid = i_gid_read(inode);
@@ -249,7 +250,7 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr) 
	mark_inode_dirty(inode);



	if (attr->ia_valid & ATTR_MODE)

		mode_to_prot(inode);

		affs_mode_to_prot(inode);

out:

	return error;

}

fs/affs/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) 
		return -ENOSPC;



	inode->i_mode = mode;

	mode_to_prot(inode);

	affs_mode_to_prot(inode);

	mark_inode_dirty(inode);



	inode->i_op = &affs_file_inode_operations;
@@ -302,7 +302,7 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
		return -ENOSPC;



	inode->i_mode = S_IFDIR | mode;

	mode_to_prot(inode);

	affs_mode_to_prot(inode);



	inode->i_op = &affs_dir_inode_operations;

	inode->i_fop = &affs_dir_operations;
@@ -348,7 +348,7 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) 
	inode_nohighmem(inode);

	inode->i_data.a_ops = &affs_symlink_aops;

	inode->i_mode = S_IFLNK | 0777;

	mode_to_prot(inode);

	affs_mode_to_prot(inode);



	error = -EIO;

	bh = affs_bread(sb, inode->i_ino);

fs/affs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ affs_commit_super(struct super_block *sb, int wait) 
	struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh);



	lock_buffer(bh);

	secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change);

	affs_secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change);

	affs_fix_checksum(sb, bh);

	unlock_buffer(bh);