Rename every instance of <ffsCamelCaseExample> to <ffs_camel_case_example> in file exfat_super.c. Fix resulting overlong lines. Co-developed-by: Johannes Weidner <johannes.weidner@xxxxxx> Signed-off-by: Johannes Weidner <johannes.weidner@xxxxxx> Signed-off-by: Julian Preis <julian.preis@xxxxxx> --- drivers/staging/exfat/exfat_super.c | 99 +++++++++++++++-------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c index 6e481908c59f..14ff3fce70fb 100644 --- a/drivers/staging/exfat/exfat_super.c +++ b/drivers/staging/exfat/exfat_super.c @@ -343,7 +343,7 @@ static inline void exfat_save_attr(struct inode *inode, u32 attr) EXFAT_I(inode)->fid.attr = attr & (ATTR_RWMASK | ATTR_READONLY); } -static int ffsMountVol(struct super_block *sb) +static int ffs_mount_vol(struct super_block *sb) { int i, ret; struct pbr_sector_t *p_pbr; @@ -439,7 +439,7 @@ static int ffsMountVol(struct super_block *sb) return ret; } -static int ffsUmountVol(struct super_block *sb) +static int ffs_umount_vol(struct super_block *sb) { struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info); int err = 0; @@ -479,7 +479,7 @@ static int ffsUmountVol(struct super_block *sb) return err; } -static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info) +static int ffs_get_vol_info(struct super_block *sb, struct vol_info_t *info) { int err = 0; struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info); @@ -509,7 +509,7 @@ static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info) return err; } -static int ffsSyncVol(struct super_block *sb, bool do_sync) +static int ffs_sync_vol(struct super_block *sb, bool do_sync) { int err = 0; struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info); @@ -534,7 +534,8 @@ static int ffsSyncVol(struct super_block *sb, bool do_sync) /* File Operation Functions */ /*----------------------------------------------------------------------*/ -static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid) +static int ffs_lookup_file(struct inode *inode, char *path, + struct file_id_t *fid) { int ret, dentry, num_entries; struct chain_t dir; @@ -621,8 +622,8 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid) return ret; } -static int ffsCreateFile(struct inode *inode, char *path, u8 mode, - struct file_id_t *fid) +static int ffs_create_file(struct inode *inode, char *path, u8 mode, + struct file_id_t *fid) { struct chain_t dir; struct uni_name_t uni_name; @@ -662,8 +663,8 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode, return ret; } -static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer, - u64 count, u64 *rcount) +static int ffs_read_file(struct inode *inode, struct file_id_t *fid, + void *buffer, u64 count, u64 *rcount) { s32 offset, sec_offset, clu_offset; u32 clu; @@ -788,8 +789,8 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer, return ret; } -static int ffsWriteFile(struct inode *inode, struct file_id_t *fid, - void *buffer, u64 count, u64 *wcount) +static int ffs_write_file(struct inode *inode, struct file_id_t *fid, + void *buffer, u64 count, u64 *wcount) { bool modified = false; s32 offset, sec_offset, clu_offset; @@ -1031,7 +1032,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid, return ret; } -static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size) +static int ffs_truncate_file(struct inode *inode, u64 old_size, u64 new_size) { s32 num_clusters; u32 last_clu = CLUSTER_32(0); @@ -1167,8 +1168,9 @@ static void update_parent_info(struct file_id_t *fid, } } -static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid, - struct inode *new_parent_inode, struct dentry *new_dentry) +static int ffs_move_file(struct inode *old_parent_inode, struct file_id_t *fid, + struct inode *new_parent_inode, + struct dentry *new_dentry) { s32 ret; s32 dentry; @@ -1296,7 +1298,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid, return ret; } -static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid) +static int ffs_remove_file(struct inode *inode, struct file_id_t *fid) { s32 dentry; int ret = 0; @@ -1360,7 +1362,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid) #if 0 /* Not currently wired up */ -static int ffsSetAttr(struct inode *inode, u32 attr) +static int ffs_set_attr(struct inode *inode, u32 attr) { u32 type; int ret = 0; @@ -1435,7 +1437,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr) } #endif -static int ffsReadStat(struct inode *inode, struct dir_entry_t *info) +static int ffs_read_stat(struct inode *inode, struct dir_entry_t *info) { s32 count; int ret = 0; @@ -1565,7 +1567,7 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info) return ret; } -static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info) +static int ffs_write_stat(struct inode *inode, struct dir_entry_t *info) { int ret = 0; struct timestamp_t tm; @@ -1638,7 +1640,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info) return ret; } -static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu) +static int ffs_map_cluster(struct inode *inode, s32 clu_offset, u32 *clu) { s32 num_clusters, num_alloced; bool modified = false; @@ -1778,7 +1780,8 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu) /* Directory Operation Functions */ /*----------------------------------------------------------------------*/ -static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid) +static int ffs_create_dir(struct inode *inode, char *path, + struct file_id_t *fid) { int ret = 0; struct chain_t dir; @@ -1818,7 +1821,7 @@ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid) return ret; } -static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry) +static int ffs_read_dir(struct inode *inode, struct dir_entry_t *dir_entry) { int i, dentry, clu_offset; int ret = 0; @@ -2005,7 +2008,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry) return ret; } -static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid) +static int ffs_remove_dir(struct inode *inode, struct file_id_t *fid) { s32 dentry; int ret = 0; @@ -2114,7 +2117,7 @@ static int exfat_readdir(struct file *filp, struct dir_context *ctx) EXFAT_I(inode)->fid.size = i_size_read(inode); EXFAT_I(inode)->fid.rwoffset = cpos >> DENTRY_SIZE_BITS; - err = ffsReadDir(inode, &de); + err = ffs_read_dir(inode, &de); if (err) { /* at least we tried to read a sector * move cpos to next sector position (should be aligned) @@ -2235,7 +2238,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, pr_debug("%s entered\n", __func__); - err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_REGULAR, &fid); + err = ffs_create_file(dir, (u8 *)dentry->d_name.name, FM_REGULAR, &fid); if (err) goto out; @@ -2282,7 +2285,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname, if (qname->len == 0) return -ENOENT; - err = ffsLookupFile(dir, (u8 *)qname->name, fid); + err = ffs_lookup_file(dir, (u8 *)qname->name, fid); if (err) return -ENOENT; @@ -2332,8 +2335,8 @@ static struct dentry *exfat_lookup(struct inode *dir, struct dentry *dentry, err = -ENOMEM; goto error; } - ffsReadFile(dir, &fid, EXFAT_I(inode)->target, - i_size_read(inode), &ret); + ffs_read_file(dir, &fid, EXFAT_I(inode)->target, + i_size_read(inode), &ret); *(EXFAT_I(inode)->target + i_size_read(inode)) = '\0'; } @@ -2402,7 +2405,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry) EXFAT_I(inode)->fid.size = i_size_read(inode); - err = ffsRemoveFile(dir, &(EXFAT_I(inode)->fid)); + err = ffs_remove_file(dir, &(EXFAT_I(inode)->fid)); if (err) goto out; @@ -2444,15 +2447,15 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry, pr_debug("%s entered\n", __func__); - err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_SYMLINK, &fid); + err = ffs_create_file(dir, (u8 *)dentry->d_name.name, FM_SYMLINK, &fid); if (err) goto out; - err = ffsWriteFile(dir, &fid, (char *)target, len, &ret); + err = ffs_write_file(dir, &fid, (char *)target, len, &ret); if (err) { - ffsRemoveFile(dir, &fid); + ffs_remove_file(dir, &fid); goto out; } @@ -2508,7 +2511,7 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) pr_debug("%s entered\n", __func__); - err = ffsCreateDir(dir, (u8 *)dentry->d_name.name, &fid); + err = ffs_create_dir(dir, (u8 *)dentry->d_name.name, &fid); if (err) goto out; @@ -2559,7 +2562,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry) EXFAT_I(inode)->fid.size = i_size_read(inode); - err = ffsRemoveDir(dir, &(EXFAT_I(inode)->fid)); + err = ffs_remove_dir(dir, &(EXFAT_I(inode)->fid)); if (err) goto out; @@ -2608,8 +2611,8 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry, EXFAT_I(old_inode)->fid.size = i_size_read(old_inode); - err = ffsMoveFile(old_dir, &(EXFAT_I(old_inode)->fid), new_dir, - new_dentry); + err = ffs_move_file(old_dir, &(EXFAT_I(old_inode)->fid), new_dir, + new_dentry); if (err) goto out; @@ -2766,7 +2769,7 @@ static void exfat_truncate(struct inode *inode, loff_t old_size) if (EXFAT_I(inode)->fid.start_clu == 0) goto out; - err = ffsTruncateFile(inode, old_size, i_size_read(inode)); + err = ffs_truncate_file(inode, old_size, i_size_read(inode)); if (err) goto out; @@ -2902,7 +2905,7 @@ static int exfat_file_release(struct inode *inode, struct file *filp) struct super_block *sb = inode->i_sb; EXFAT_I(inode)->fid.size = i_size_read(inode); - ffsSyncVol(sb, false); + ffs_sync_vol(sb, false); return 0; } @@ -2957,7 +2960,7 @@ static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys, EXFAT_I(inode)->fid.size = i_size_read(inode); - err = ffsMapCluster(inode, clu_offset, &cluster); + err = ffs_map_cluster(inode, clu_offset, &cluster); if (!err && (cluster != CLUSTER_32(~0))) { *phys = START_SECTOR(cluster) + sec_offset; @@ -3150,7 +3153,7 @@ static int exfat_fill_inode(struct inode *inode, struct file_id_t *fid) memcpy(&(EXFAT_I(inode)->fid), fid, sizeof(struct file_id_t)); - ffsReadStat(inode, &info); + ffs_read_stat(inode, &info); EXFAT_I(inode)->i_pos = 0; EXFAT_I(inode)->target = NULL; @@ -3266,7 +3269,7 @@ static int exfat_write_inode(struct inode *inode, struct writeback_control *wbc) exfat_time_unix2fat(&inode->i_ctime, &info.CreateTimestamp); exfat_time_unix2fat(&inode->i_atime, &info.AccessTimestamp); - ffsWriteStat(inode, &info); + ffs_write_stat(inode, &info); return 0; } @@ -3304,7 +3307,7 @@ static void exfat_put_super(struct super_block *sb) if (__is_sb_dirty(sb)) exfat_write_super(sb); - ffsUmountVol(sb); + ffs_umount_vol(sb); sb->s_fs_info = NULL; exfat_free_super(sbi); @@ -3317,7 +3320,7 @@ static void exfat_write_super(struct super_block *sb) __set_sb_clean(sb); if (!sb_rdonly(sb)) - ffsSyncVol(sb, true); + ffs_sync_vol(sb, true); __unlock_super(sb); } @@ -3329,7 +3332,7 @@ static int exfat_sync_fs(struct super_block *sb, int wait) if (__is_sb_dirty(sb)) { __lock_super(sb); __set_sb_clean(sb); - err = ffsSyncVol(sb, true); + err = ffs_sync_vol(sb, true); __unlock_super(sb); } @@ -3344,7 +3347,7 @@ static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf) struct vol_info_t info; if (p_fs->used_clusters == UINT_MAX) { - if (ffsGetVolInfo(sb, &info) == -EIO) + if (ffs_get_vol_info(sb, &info) == -EIO) return -EIO; } else { @@ -3646,7 +3649,7 @@ static int exfat_read_root(struct inode *inode) EXFAT_I(inode)->target = NULL; - ffsReadStat(inode, &info); + ffs_read_stat(inode, &info); inode->i_uid = sbi->options.fs_uid; inode->i_gid = sbi->options.fs_gid; @@ -3713,10 +3716,10 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent) sb_min_blocksize(sb, 512); sb->s_maxbytes = 0x7fffffffffffffffLL; /* maximum file size */ - ret = ffsMountVol(sb); + ret = ffs_mount_vol(sb); if (ret) { if (!silent) - pr_err("[EXFAT] ffsMountVol failed\n"); + pr_err("[EXFAT] ffs_mount_vol failed\n"); goto out_fail; } @@ -3756,7 +3759,7 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent) return 0; out_fail2: - ffsUmountVol(sb); + ffs_umount_vol(sb); out_fail: if (root_inode) iput(root_inode); -- 2.20.1