Fixed checkpatch.pl reported ERRORs
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/balloc.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/balloc.c b/linux-3.7-rc1/fs/ext4/balloc.c
index 1b50890..395418d 100644
--- a/linux-3.7-rc1/fs/ext4/balloc.c
+++ b/linux-3.7-rc1/fs/ext4/balloc.c
@@ -246,7 +246,7 @@ unsigned ext4_free_clusters_after_init(struct super_block *sb,
* @bh: pointer to the buffer head to store the block
* group descriptor
*/
-struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
+struct ext4_group_desc *ext4_get_group_desc(struct super_block *sb,
ext4_group_t block_group,
struct buffer_head **bh)
{
@@ -700,7 +700,7 @@ static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,
if (!ext4_bg_has_super(sb, group))
return 0;
- if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG))
+ if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG))
return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
else
return EXT4_SB(sb)->s_gdb_count;
@@ -721,11 +721,11 @@ unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group)
le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);
- if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) ||
+ if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
metagroup < first_meta_bg)
return ext4_bg_num_gdb_nometa(sb, group);
- return ext4_bg_num_gdb_meta(sb,group);
+ return ext4_bg_num_gdb_meta(sb, group);
}
--
1.7.7.3
Fixed checkpatch.pl reported issue
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/block_validity.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/block_validity.c b/linux-3.7-rc1/fs/ext4/block_validity.c
index 3f11656..d04018a 100644
--- a/linux-3.7-rc1/fs/ext4/block_validity.c
+++ b/linux-3.7-rc1/fs/ext4/block_validity.c
@@ -154,7 +154,7 @@ int ext4_setup_system_zone(struct super_block *sb)
if (EXT4_SB(sb)->system_blks.rb_node)
return 0;
- for (i=0; i < ngroups; i++) {
+ for (i = 0; i < ngroups; i++) {
if (ext4_bg_has_super(sb, i) &&
((i < 5) || ((i % flex_size) == 0)))
add_system_zone(sbi, ext4_group_first_block_no(sb, i),
--
1.7.7.3
Fixed some of issues reported by checkpatch.pl
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/ext4.h | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/ext4.h b/linux-3.7-rc1/fs/ext4/ext4.h
index 3ab2539..60e3802 100644
--- a/linux-3.7-rc1/fs/ext4/ext4.h
+++ b/linux-3.7-rc1/fs/ext4/ext4.h
@@ -289,8 +289,7 @@ struct ext4_io_submit {
/*
* Structure of a blocks group descriptor
*/
-struct ext4_group_desc
-{
+struct ext4_group_desc {
__le32 bg_block_bitmap_lo; /* Blocks bitmap block */
__le32 bg_inode_bitmap_lo; /* Inodes bitmap block */
__le32 bg_inode_table_lo; /* Inodes table block */
@@ -721,17 +720,17 @@ struct move_extent {
static inline __le32 ext4_encode_extra_time(struct timespec *time)
{
- return cpu_to_le32((sizeof(time->tv_sec) > 4 ?
+ return cpu_to_le32((sizeof(time->tv_sec) > 4 ?
(time->tv_sec >> 32) & EXT4_EPOCH_MASK : 0) |
((time->tv_nsec << EXT4_EPOCH_BITS) & EXT4_NSEC_MASK));
}
static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
{
- if (sizeof(time->tv_sec) > 4)
+ if (sizeof(time->tv_sec) > 4)
time->tv_sec |= (__u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK)
<< 32;
- time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
+ time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
}
#define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode) \
@@ -1099,7 +1098,7 @@ struct ext4_super_block {
__le32 s_r_blocks_count_hi; /* Reserved blocks count */
__le32 s_free_blocks_count_hi; /* Free blocks count */
__le16 s_min_extra_isize; /* All inodes have at least # bytes */
- __le16 s_want_extra_isize; /* New inodes should reserve # bytes */
+ __le16 s_want_extra_isize; /* New inodes should reserve # bytes */
__le32 s_flags; /* Miscellaneous flags */
__le16 s_raid_stride; /* RAID stride */
__le16 s_mmp_update_interval; /* # seconds to wait in MMP checking */
@@ -1164,7 +1163,7 @@ struct ext4_sb_info {
unsigned int s_cluster_ratio; /* Number of blocks per cluster */
unsigned int s_cluster_bits; /* log2 of s_cluster_ratio */
loff_t s_bitmap_maxbytes; /* max bytes for bitmap files */
- struct buffer_head * s_sbh; /* Buffer containing the super block */
+ struct buffer_head *s_sbh; /* Buffer containing the super block */
struct ext4_super_block *s_es; /* Pointer to the super block in the buffer */
struct buffer_head **s_group_desc;
unsigned int s_mount_opt;
@@ -1686,7 +1685,7 @@ static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,
} desc;
int err;
- BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver)!=sizeof(desc.ctx));
+ BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver) != sizeof(desc.ctx));
desc.shash.tfm = sbi->s_chksum_driver;
desc.shash.flags = 0;
@@ -1701,8 +1700,7 @@ static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,
#ifdef __KERNEL__
/* hash info structure used by the directory hash */
-struct dx_hash_info
-{
+struct dx_hash_info {
u32 hash;
u32 minor_hash;
int hash_version;
@@ -1724,8 +1722,7 @@ struct dx_hash_info
/*
* Describe an inode's exact location on disk and in memory
*/
-struct ext4_iloc
-{
+struct ext4_iloc {
struct buffer_head *bh;
unsigned long offset;
ext4_group_t block_group;
@@ -1908,9 +1905,9 @@ extern int ext4_claim_free_clusters(struct ext4_sb_info *sbi,
s64 nclusters, unsigned int flags);
extern ext4_fsblk_t ext4_count_free_clusters(struct super_block *);
extern void ext4_check_blocks_bitmap(struct super_block *);
-extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
+extern struct ext4_group_desc *ext4_get_group_desc(struct super_block *sb,
ext4_group_t block_group,
- struct buffer_head ** bh);
+ struct buffer_head **bh);
extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);
extern struct buffer_head *ext4_read_block_bitmap_nowait(struct super_block *sb,
@@ -1958,7 +1955,7 @@ extern struct inode *ext4_new_inode(handle_t *, struct inode *, umode_t,
const struct qstr *qstr, __u32 goal,
uid_t *owner);
extern void ext4_free_inode(handle_t *, struct inode *);
-extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);
+extern struct inode *ext4_orphan_get(struct super_block *, unsigned long);
extern unsigned long ext4_count_free_inodes(struct super_block *);
extern unsigned long ext4_count_dirs(struct super_block *);
extern void ext4_check_inodes_bitmap(struct super_block *);
--
1.7.7.3
Fixed checkpatch.pl reported issue
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/extents.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/extents.c b/linux-3.7-rc1/fs/ext4/extents.c
index 1c94cca..599ce00 100644
--- a/linux-3.7-rc1/fs/ext4/extents.c
+++ b/linux-3.7-rc1/fs/ext4/extents.c
@@ -3367,7 +3367,7 @@ static void unmap_underlying_metadata_blocks(struct block_device *bdev,
{
int i;
for (i = 0; i < count; i++)
- unmap_underlying_metadata(bdev, block + i);
+ unmap_underlying_metadata(bdev, block + i);
}
/*
@@ -4096,7 +4096,7 @@ got_allocated_blocks:
ext4_ext_store_pblock(&newex, newblock + offset);
newex.ee_len = cpu_to_le16(ar.len);
/* Mark uninitialized */
- if (flags & EXT4_GET_BLOCKS_UNINIT_EXT){
+ if (flags & EXT4_GET_BLOCKS_UNINIT_EXT) {
ext4_ext_mark_uninitialized(&newex);
/*
* io_end structure was created for every IO write to an
@@ -4527,7 +4527,7 @@ int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset,
}
ext4_mark_inode_dirty(handle, inode);
ret2 = ext4_journal_stop(handle);
- if (ret <= 0 || ret2 )
+ if (ret <= 0 || ret2)
break;
}
return ret > 0 ? ret2 : ret;
--
1.7.7.3
Removed errors reported by checkpatch.pl
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/file.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/file.c b/linux-3.7-rc1/fs/ext4/file.c
index bf3966b..17068a7 100644
--- a/linux-3.7-rc1/fs/ext4/file.c
+++ b/linux-3.7-rc1/fs/ext4/file.c
@@ -43,8 +43,7 @@ static int ext4_release_file(struct inode *inode, struct file *filp)
/* if we are the last writer on the inode, drop the block reservation */
if ((filp->f_mode & FMODE_WRITE) &&
(atomic_read(&inode->i_writecount) == 1) &&
- !EXT4_I(inode)->i_reserved_data_blocks)
- {
+ !EXT4_I(inode)->i_reserved_data_blocks) {
down_write(&EXT4_I(inode)->i_data_sem);
ext4_discard_preallocations(inode);
up_write(&EXT4_I(inode)->i_data_sem);
@@ -221,7 +220,7 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
return 0;
}
-static int ext4_file_open(struct inode * inode, struct file * filp)
+static int ext4_file_open(struct inode *inode, struct file *filp)
{
struct super_block *sb = inode->i_sb;
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
--
1.7.7.3
Fixed one of checkpatch.pl reported issue
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/ialloc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/ialloc.c b/linux-3.7-rc1/fs/ext4/ialloc.c
index fa36372..2e63f4a 100644
--- a/linux-3.7-rc1/fs/ext4/ialloc.c
+++ b/linux-3.7-rc1/fs/ext4/ialloc.c
@@ -1086,7 +1086,7 @@ unsigned long ext4_count_free_inodes(struct super_block *sb)
}
/* Called at mount-time, super-block is locked */
-unsigned long ext4_count_dirs(struct super_block * sb)
+unsigned long ext4_count_dirs(struct super_block *sb)
{
unsigned long count = 0;
ext4_group_t i, ngroups = ext4_get_groups_count(sb);
--
1.7.7.3
Fixed coding style issue reported by checkpatch.pl
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/inode.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/inode.c b/linux-3.7-rc1/fs/ext4/inode.c
index b3c243b..a174620 100644
--- a/linux-3.7-rc1/fs/ext4/inode.c
+++ b/linux-3.7-rc1/fs/ext4/inode.c
@@ -2880,7 +2880,7 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
bool is_async)
{
struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
- ext4_io_end_t *io_end = iocb->private;
+ ext4_io_end_t *io_end = iocb->private;
/* if not async direct IO or dio with 0 bytes write, just return */
if (!io_end || !size)
@@ -3435,9 +3435,9 @@ static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,
zero_user(page, pos, range_to_discard);
err = 0;
- if (ext4_should_journal_data(inode)) {
+ if (ext4_should_journal_data(inode))
err = ext4_handle_dirty_metadata(handle, inode, bh);
- } else
+ else
mark_buffer_dirty(bh);
BUFFER_TRACE(bh, "Partial buffer zeroed");
--
1.7.7.3
Fixed checkpatch.pl reported issue
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/ioctl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/ioctl.c b/linux-3.7-rc1/fs/ext4/ioctl.c
index 5747f52..a534615 100644
--- a/linux-3.7-rc1/fs/ext4/ioctl.c
+++ b/linux-3.7-rc1/fs/ext4/ioctl.c
@@ -194,7 +194,7 @@ setversion_out:
}
case EXT4_IOC_GROUP_EXTEND: {
ext4_fsblk_t n_blocks_count;
- int err, err2=0;
+ int err, err2 = 0;
err = ext4_resize_begin(sb);
if (err)
@@ -280,7 +280,7 @@ mext_out:
case EXT4_IOC_GROUP_ADD: {
struct ext4_new_group_data input;
- int err, err2=0;
+ int err, err2 = 0;
err = ext4_resize_begin(sb);
if (err)
--
1.7.7.3
Fixed checkpatch.pl reported issues
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/namei.c | 135 ++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 77 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/namei.c b/linux-3.7-rc1/fs/ext4/namei.c
index 6d600a6..44b7d09 100644
--- a/linux-3.7-rc1/fs/ext4/namei.c
+++ b/linux-3.7-rc1/fs/ext4/namei.c
@@ -47,7 +47,7 @@
#define NAMEI_RA_CHUNKS 2
#define NAMEI_RA_BLOCKS 4
#define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
-#define NAMEI_RA_INDEX(c,b) (((c) * NAMEI_RA_BLOCKS) + (b))
+#define NAMEI_RA_INDEX(c , b) (((c) * NAMEI_RA_BLOCKS) + (b))
static struct buffer_head *ext4_append(handle_t *handle,
struct inode *inode,
@@ -93,22 +93,19 @@ static struct buffer_head *ext4_append(handle_t *handle,
#define dxtrace(command)
#endif
-struct fake_dirent
-{
+struct fake_dirent {
__le32 inode;
__le16 rec_len;
u8 name_len;
u8 file_type;
};
-struct dx_countlimit
-{
+struct dx_countlimit {
__le16 limit;
__le16 count;
};
-struct dx_entry
-{
+struct dx_entry {
__le32 hash;
__le32 block;
};
@@ -119,14 +116,12 @@ struct dx_entry
* hash version mod 4 should never be 0. Sincerely, the paranoia department.
*/
-struct dx_root
-{
+struct dx_root {
struct fake_dirent dot;
char dot_name[4];
struct fake_dirent dotdot;
char dotdot_name[4];
- struct dx_root_info
- {
+ struct dx_root_info {
__le32 reserved_zero;
u8 hash_version;
u8 info_length; /* 8 */
@@ -137,22 +132,19 @@ struct dx_root
struct dx_entry entries[0];
};
-struct dx_node
-{
+struct dx_node {
struct fake_dirent fake;
struct dx_entry entries[0];
};
-struct dx_frame
-{
+struct dx_frame {
struct buffer_head *bh;
struct dx_entry *entries;
struct dx_entry *at;
};
-struct dx_map_entry
-{
+struct dx_map_entry {
u32 hash;
u16 offs;
u16 size;
@@ -187,14 +179,14 @@ static int dx_make_map(struct ext4_dir_entry_2 *de, unsigned blocksize,
static void dx_sort_map(struct dx_map_entry *map, unsigned count);
static struct ext4_dir_entry_2 *dx_move_dirents(char *from, char *to,
struct dx_map_entry *offsets, int count, unsigned blocksize);
-static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize);
+static struct ext4_dir_entry_2 *dx_pack_dirents(char *base, unsigned blocksize);
static void dx_insert_block(struct dx_frame *frame,
u32 hash, ext4_lblk_t block);
static int ext4_htree_next_block(struct inode *dir, __u32 hash,
struct dx_frame *frame,
struct dx_frame *frames,
__u32 *start_hash);
-static struct buffer_head * ext4_dx_find_entry(struct inode *dir,
+static struct buffer_head *ext4_dx_find_entry(struct inode *dir,
const struct qstr *d_name,
struct ext4_dir_entry_2 **res_dir,
int *err);
@@ -505,9 +497,9 @@ static inline unsigned dx_node_limit(struct inode *dir)
* Debug
*/
#ifdef DX_DEBUG
-static void dx_show_index(char * label, struct dx_entry *entries)
+static void dx_show_index(char *label, struct dx_entry *entries)
{
- int i, n = dx_get_count (entries);
+ int i, n = dx_get_count(entries);
printk(KERN_DEBUG "%s index ", label);
for (i = 0; i < n; i++) {
printk("%x->%lu ", i ? dx_get_hash(entries + i) :
@@ -516,8 +508,7 @@ static void dx_show_index(char * label, struct dx_entry *entries)
printk("\n");
}
-struct stats
-{
+struct stats {
unsigned names;
unsigned space;
unsigned bcount;
@@ -531,12 +522,9 @@ static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext4_dir_ent
struct dx_hash_info h = *hinfo;
printk("names: ");
- while ((char *) de < base + size)
- {
- if (de->inode)
- {
- if (show_names)
- {
+ while ((char *) de < base + size) {
+ if (de->inode) {
+ if (show_names) {
int len = de->name_len;
char *name = de->name;
while (len--) printk("%c", *name++);
@@ -562,14 +550,13 @@ struct stats dx_show_entries(struct dx_hash_info *hinfo, struct inode *dir,
struct buffer_head *bh;
int err;
printk("%i indexed blocks...\n", count);
- for (i = 0; i < count; i++, entries++)
- {
+ for (i = 0; i < count; i++, entries++) {
ext4_lblk_t block = dx_get_block(entries);
ext4_lblk_t hash = i ? dx_get_hash(entries): 0;
u32 range = i < count - 1? (dx_get_hash(entries + 1) - hash): ~hash;
struct stats stats;
printk("%s%3u:%03u hash %8x/%8x ",levels?"":" ", i, block, hash, range);
- if (!(bh = ext4_bread (NULL,dir, block, 0,&err))) continue;
+ if (!(bh = ext4_bread(NULL, dir, block, 0, &err))) continue;
stats = levels?
dx_show_entries(hinfo, dir, ((struct dx_node *) bh->b_data)->entries, levels - 1):
dx_show_leaf(hinfo, (struct ext4_dir_entry_2 *) bh->b_data, blocksize, 0);
@@ -667,8 +654,7 @@ dx_probe(const struct qstr *d_name, struct inode *dir,
}
dxtrace(printk("Look up %x", hash));
- while (1)
- {
+ while (1) {
count = dx_get_count(entries);
if (!count || count > dx_get_limit(entries)) {
ext4_warning(dir->i_sb,
@@ -680,8 +666,7 @@ dx_probe(const struct qstr *d_name, struct inode *dir,
p = entries + 1;
q = entries + count - 1;
- while (p <= q)
- {
+ while (p <= q) {
m = p + (q - p)/2;
dxtrace(printk("."));
if (dx_get_hash(m) > hash)
@@ -690,20 +675,17 @@ dx_probe(const struct qstr *d_name, struct inode *dir,
p = m + 1;
}
- if (0) // linear search cross check
- {
+ if (0) { /* linear search cross check */
unsigned n = count - 1;
at = entries;
- while (n--)
- {
+ while (n--) {
dxtrace(printk(","));
- if (dx_get_hash(++at) > hash)
- {
+ if (dx_get_hash(++at) > hash) {
at--;
break;
}
}
- assert (at == p - 1);
+ assert(at == p - 1);
}
at = p - 1;
@@ -729,7 +711,7 @@ dx_probe(const struct qstr *d_name, struct inode *dir,
}
set_buffer_verified(bh);
- if (dx_get_limit(entries) != dx_node_limit (dir)) {
+ if (dx_get_limit(entries) != dx_node_limit(dir)) {
ext4_warning(dir->i_sb,
"dx entry: limit != node limit");
brelse(bh);
@@ -752,7 +734,7 @@ fail:
return NULL;
}
-static void dx_release (struct dx_frame *frames)
+static void dx_release(struct dx_frame *frames)
{
if (frames[0].bh == NULL)
return;
@@ -964,7 +946,7 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
goto errout;
count++;
}
- if (start_hash < 2 || (start_hash ==2 && start_minor_hash==0)) {
+ if (start_hash < 2 || (start_hash == 2 && start_minor_hash == 0)) {
de = (struct ext4_dir_entry_2 *) frames[0].bh->b_data;
de = ext4_next_entry(de, dir->i_sb->s_blocksize);
if ((err = ext4_htree_store_dirent(dir_file, 2, 0, de)) != 0)
@@ -1004,7 +986,7 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
return count;
errout:
dx_release(frames);
- return (err);
+ return err;
}
@@ -1041,7 +1023,7 @@ static int dx_make_map(struct ext4_dir_entry_2 *de, unsigned blocksize,
}
/* Sort map by hash value */
-static void dx_sort_map (struct dx_map_entry *map, unsigned count)
+static void dx_sort_map(struct dx_map_entry *map, unsigned count)
{
struct dx_map_entry *p, *q, *top = map + count - 1;
int more;
@@ -1064,7 +1046,7 @@ static void dx_sort_map (struct dx_map_entry *map, unsigned count)
swap(*(q+1), *q);
more = 1;
}
- } while(more);
+ } while (more);
}
static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block)
@@ -1094,8 +1076,8 @@ static void ext4_update_dx_flag(struct inode *inode)
* `len <= EXT4_NAME_LEN' is guaranteed by caller.
* `de != NULL' is guaranteed by caller.
*/
-static inline int ext4_match (int len, const char * const name,
- struct ext4_dir_entry_2 * de)
+static inline int ext4_match(int len, const char * const name,
+ struct ext4_dir_entry_2 *de)
{
if (len != de->name_len)
return 0;
@@ -1111,10 +1093,10 @@ static inline int search_dirblock(struct buffer_head *bh,
struct inode *dir,
const struct qstr *d_name,
unsigned int offset,
- struct ext4_dir_entry_2 ** res_dir)
+ struct ext4_dir_entry_2 **res_dir)
{
- struct ext4_dir_entry_2 * de;
- char * dlimit;
+ struct ext4_dir_entry_2 *de;
+ char *dlimit;
int de_len;
const char *name = d_name->name;
int namelen = d_name->len;
@@ -1126,7 +1108,7 @@ static inline int search_dirblock(struct buffer_head *bh,
/* do minimal checking `by hand' */
if ((char *) de + namelen <= dlimit &&
- ext4_match (namelen, name, de)) {
+ ext4_match(namelen, name, de)) {
/* found a match - just to be sure, do a full check */
if (ext4_check_dir_entry(dir, NULL, de, bh, offset))
return -1;
@@ -1156,9 +1138,9 @@ static inline int search_dirblock(struct buffer_head *bh,
* The returned buffer_head has ->b_count elevated. The caller is expected
* to brelse() it when appropriate.
*/
-static struct buffer_head * ext4_find_entry (struct inode *dir,
+static struct buffer_head *ext4_find_entry(struct inode *dir,
const struct qstr *d_name,
- struct ext4_dir_entry_2 ** res_dir)
+ struct ext4_dir_entry_2 **res_dir)
{
struct super_block *sb;
struct buffer_head *bh_use[NAMEI_RA_SIZE];
@@ -1286,10 +1268,10 @@ cleanup_and_exit:
return ret;
}
-static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name,
+static struct buffer_head *ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name,
struct ext4_dir_entry_2 **res_dir, int *err)
{
- struct super_block * sb = dir->i_sb;
+ struct super_block *sb = dir->i_sb;
struct dx_hash_info hinfo;
struct dx_frame frames[2], *frame;
struct buffer_head *bh;
@@ -1348,7 +1330,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct q
*err = -ENOENT;
errout:
dxtrace(printk(KERN_DEBUG "%s not found\n", d_name->name));
- dx_release (frames);
+ dx_release(frames);
return NULL;
}
@@ -1392,7 +1374,7 @@ struct dentry *ext4_get_parent(struct dentry *child)
{
__u32 ino;
static const struct qstr dotdot = QSTR_INIT("..", 2);
- struct ext4_dir_entry_2 * de;
+ struct ext4_dir_entry_2 *de;
struct buffer_head *bh;
bh = ext4_find_entry(child->d_inode, &dotdot, &de);
@@ -1442,7 +1424,7 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count,
struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
(from + (map->offs<<2));
rec_len = EXT4_DIR_REC_LEN(de->name_len);
- memcpy (to, de, rec_len);
+ memcpy(to, de, rec_len);
((struct ext4_dir_entry_2 *) to)->rec_len =
ext4_rec_len_to_disk(rec_len, blocksize);
de->inode = 0;
@@ -1456,13 +1438,13 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count,
* Compact each dir entry in the range to the minimal rec_len.
* Returns pointer to last entry in range.
*/
-static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize)
+static struct ext4_dir_entry_2 *dx_pack_dirents(char *base, unsigned blocksize)
{
struct ext4_dir_entry_2 *next, *to, *prev, *de = (struct ext4_dir_entry_2 *) base;
unsigned rec_len = 0;
prev = to = de;
- while ((char*)de < base + blocksize) {
+ while ((char *)de < base + blocksize) {
next = ext4_next_entry(de, blocksize);
if (de->inode && de->name_len) {
rec_len = EXT4_DIR_REC_LEN(de->name_len);
@@ -1483,7 +1465,7 @@ static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize)
* Returns pointer to de in block into which the new entry will be inserted.
*/
static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
- struct buffer_head **bh,struct dx_frame *frame,
+ struct buffer_head **bh, struct dx_frame *frame,
struct dx_hash_info *hinfo, int *error)
{
unsigned blocksize = dir->i_sb->s_blocksize;
@@ -1503,7 +1485,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
csum_size = sizeof(struct ext4_dir_entry_tail);
- bh2 = ext4_append (handle, dir, &newblock, &err);
+ bh2 = ext4_append(handle, dir, &newblock, &err);
if (!(bh2)) {
brelse(*bh);
*bh = NULL;
@@ -1563,12 +1545,11 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
initialize_dirent_tail(t, blocksize);
}
- dxtrace(dx_show_leaf (hinfo, (struct ext4_dir_entry_2 *) data1, blocksize, 1));
- dxtrace(dx_show_leaf (hinfo, (struct ext4_dir_entry_2 *) data2, blocksize, 1));
+ dxtrace(dx_show_leaf(hinfo, (struct ext4_dir_entry_2 *) data1, blocksize, 1));
+ dxtrace(dx_show_leaf(hinfo, (struct ext4_dir_entry_2 *) data2, blocksize, 1));
/* Which block gets the new entry? */
- if (hinfo->hash >= hash2)
- {
+ if (hinfo->hash >= hash2) {
swap(*bh, bh2);
de = de2;
}
@@ -1630,7 +1611,7 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
return -EEXIST;
nlen = EXT4_DIR_REC_LEN(de->name_len);
rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
- if ((de->inode? rlen - nlen: rlen) >= reclen)
+ if ((de->inode ? rlen - nlen : rlen) >= reclen)
break;
de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
offset += rlen;
@@ -1740,7 +1721,7 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
ext4_set_inode_flag(dir, EXT4_INODE_INDEX);
data1 = bh2->b_data;
- memcpy (data1, de, len);
+ memcpy(data1, de, len);
de = (struct ext4_dir_entry_2 *) data1;
top = data1 + len;
while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top)
@@ -1758,7 +1739,7 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
de = (struct ext4_dir_entry_2 *) (&root->dotdot);
de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2),
blocksize);
- memset (&root->info, 0, sizeof(root->info));
+ memset(&root->info, 0, sizeof(root->info));
root->info.info_length = sizeof(root->info);
root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version;
entries = root->entries;
@@ -1781,7 +1762,7 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
ext4_handle_dirty_dx_node(handle, dir, frame->bh);
ext4_handle_dirty_dirent_node(handle, dir, bh);
- de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
+ de = do_split(handle, dir, &bh, frame, &hinfo, &retval);
if (!de) {
/*
* Even if the block split failed, we have to properly write
@@ -1818,7 +1799,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
struct ext4_dir_entry_tail *t;
struct super_block *sb;
int retval;
- int dx_fallback=0;
+ int dx_fallback = 0;
unsigned blocksize;
ext4_lblk_t block, blocks;
int csum_size = 0;
@@ -1948,7 +1929,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
err = -ENOSPC;
goto cleanup;
}
- bh2 = ext4_append (handle, dir, &newblock, &err);
+ bh2 = ext4_append(handle, dir, &newblock, &err);
if (!(bh2))
goto cleanup;
node2 = (struct dx_node *)(bh2->b_data);
@@ -1991,7 +1972,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
err = ext4_handle_dirty_dx_node(handle, dir, bh2);
if (err)
goto journal_error;
- brelse (bh2);
+ brelse(bh2);
} else {
dxtrace(printk(KERN_DEBUG
"Creating second level index...\n"));
--
1.7.7.3
Fixed checkpatch.pl reported issues
Signed-off-by: Adil Mujeeb <[email protected]>
---
linux-3.7-rc1/fs/ext4/resize.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-3.7-rc1/fs/ext4/resize.c b/linux-3.7-rc1/fs/ext4/resize.c
index 7a75e10..c00bb81 100644
--- a/linux-3.7-rc1/fs/ext4/resize.c
+++ b/linux-3.7-rc1/fs/ext4/resize.c
@@ -691,7 +691,7 @@ static int verify_reserved_gdb(struct super_block *sb,
while ((grp = ext4_list_backups(sb, &three, &five, &seven)) < end) {
if (le32_to_cpu(*p++) !=
- grp * EXT4_BLOCKS_PER_GROUP(sb) + blk){
+ grp * EXT4_BLOCKS_PER_GROUP(sb) + blk) {
ext4_warning(sb, "reserved GDT %llu"
" missing grp %d (%llu)",
blk, grp,
@@ -917,7 +917,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
ext4_group_t group)
{
struct super_block *sb = inode->i_sb;
- int reserved_gdb =le16_to_cpu(EXT4_SB(sb)->s_es->s_reserved_gdt_blocks);
+ int reserved_gdb = le16_to_cpu(EXT4_SB(sb)->s_es->s_reserved_gdt_blocks);
struct buffer_head **primary;
struct buffer_head *dind;
struct ext4_iloc iloc;
@@ -1232,7 +1232,7 @@ static int ext4_setup_new_descs(handle_t *handle, struct super_block *sb,
ext4_group_t group;
__u16 *bg_flags = flex_gd->bg_flags;
int i, gdb_off, gdb_num, err = 0;
-
+
for (i = 0; i < flex_gd->count; i++, group_data++, bg_flags++) {
group = group_data->group;
--
1.7.7.3
On Wed, 17 Oct 2012, Adil Mujeeb wrote:
> Date: Wed, 17 Oct 2012 00:42:56 +0530
> From: Adil Mujeeb <[email protected]>
> To: [email protected], [email protected], [email protected],
> [email protected]
> Cc: Adil Mujeeb <[email protected]>
> Subject: [PATCH 01/10] ext4: balloc: Fixed coding style issue
>
> Fixed checkpatch.pl reported ERRORs
Hi Adil,
let me ask you something. How useful do you think those changes are ?
Have you learned anything by creating those patches ?
Just to clarify why I am asking such weird questions. It's not one of
those sneer questions, I would really like to know.
Thanks!
-Lukas
>
> Signed-off-by: Adil Mujeeb <[email protected]>
> ---
> linux-3.7-rc1/fs/ext4/balloc.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/linux-3.7-rc1/fs/ext4/balloc.c b/linux-3.7-rc1/fs/ext4/balloc.c
> index 1b50890..395418d 100644
> --- a/linux-3.7-rc1/fs/ext4/balloc.c
> +++ b/linux-3.7-rc1/fs/ext4/balloc.c
> @@ -246,7 +246,7 @@ unsigned ext4_free_clusters_after_init(struct super_block *sb,
> * @bh: pointer to the buffer head to store the block
> * group descriptor
> */
> -struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
> +struct ext4_group_desc *ext4_get_group_desc(struct super_block *sb,
> ext4_group_t block_group,
> struct buffer_head **bh)
> {
> @@ -700,7 +700,7 @@ static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,
> if (!ext4_bg_has_super(sb, group))
> return 0;
>
> - if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG))
> + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG))
> return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
> else
> return EXT4_SB(sb)->s_gdb_count;
> @@ -721,11 +721,11 @@ unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group)
> le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
> unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);
>
> - if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) ||
> + if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
> metagroup < first_meta_bg)
> return ext4_bg_num_gdb_nometa(sb, group);
>
> - return ext4_bg_num_gdb_meta(sb,group);
> + return ext4_bg_num_gdb_meta(sb, group);
>
> }
>
>
On Wed, Oct 17, 2012 at 2:05 PM, Lukáš Czerner <[email protected]> wrote:
> On Wed, 17 Oct 2012, Adil Mujeeb wrote:
>
>> Date: Wed, 17 Oct 2012 00:42:56 +0530
>> From: Adil Mujeeb <[email protected]>
>> To: [email protected], [email protected], [email protected],
>> [email protected]
>> Cc: Adil Mujeeb <[email protected]>
>> Subject: [PATCH 01/10] ext4: balloc: Fixed coding style issue
>>
>> Fixed checkpatch.pl reported ERRORs
>
> Hi Adil,
>
> let me ask you something. How useful do you think those changes are ?
> Have you learned anything by creating those patches ?
>
> Just to clarify why I am asking such weird questions. It's not one of
> those sneer questions, I would really like to know.
>> linux-3.7-rc1/fs/ext4/balloc.c | 8 ++++----
The really sad thing is that this patch does not even apply because
the path is malformed.
--
Thanks,
//richard