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: Fabian Frederick <fabf@skynet.be>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 1b5542818b2c0b2209974e23b7aa3dd014704c66..2f8bab390d1379731ce889ff2b1beec5ddf91a53 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -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, ...);

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index fd7a7542956d96b7407ced73154d28dfb201999d..b573c3b9a3287014c469ea957be95546a23c8b77 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -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;

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index fe4e1290dbb5d59288b79463250ec9be378b0227..a5e6097eb5a9dd157576db7e546d6b94a5a54970 100644 (file)
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -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;
 }

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index 04c3156ff4119b4cc6b7cfde8cddbcacffc303c6..906ff5be66c200d66b610cbf5494a8982b7dc052 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -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);

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 98bd95291694552c33235b5ab20a6a479cd08025..37532538e8ab12fac95f5182512aedd104b56dbf 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -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);