openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: Fix checkpatch.pl warning of spacing issues 

Fix spacing issues detected via checkpatch.pl in accordance with the
kernel style guidelines.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Dulshani Gunawardhana 2013-10-31 10:33:04 +05:30 committed by Chris Mason
parent d9b0d9ba04
commit 678712545b
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/async-thread.c
View File

@ -262,7 +262,7 @@ static struct btrfs_work *get_next_work(struct btrfs_worker_thread *worker,
struct btrfs_work *work = NULL; struct btrfs_work *work = NULL;
struct list_head *cur = NULL; struct list_head *cur = NULL;
if(!list_empty(prio_head)) if (!list_empty(prio_head))
cur = prio_head->next; cur = prio_head->next;
smp_mb(); smp_mb();

2
fs/btrfs/compression.c
View File

@ -359,7 +359,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev; bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS); bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS);
if(!bio) { if (!bio) {
kfree(cb); kfree(cb);
return -ENOMEM; return -ENOMEM;
} }

2
fs/btrfs/ctree.c
View File

@ -4018,7 +4018,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
data_size > BTRFS_LEAF_DATA_SIZE(root)) { data_size > BTRFS_LEAF_DATA_SIZE(root)) {
if (data_size && !tried_avoid_double) if (data_size && !tried_avoid_double)
goto push_for_double; goto push_for_double;
split = 2 ; split = 2;
} }
} }
} }

6
fs/btrfs/extent-tree.c
View File

@ -5017,7 +5017,7 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
if (to_reserve) if (to_reserve)
trace_btrfs_space_reservation(root->fs_info,"delalloc", trace_btrfs_space_reservation(root->fs_info, "delalloc",
btrfs_ino(inode), to_reserve, 1); btrfs_ino(inode), to_reserve, 1);
block_rsv_add_bytes(block_rsv, to_reserve, 1); block_rsv_add_bytes(block_rsv, to_reserve, 1);
@ -8022,7 +8022,7 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)
spin_lock(&sinfo->lock); spin_lock(&sinfo->lock);
for(i = 0; i < BTRFS_NR_RAID_TYPES; i++) for (i = 0; i < BTRFS_NR_RAID_TYPES; i++)
if (!list_empty(&sinfo->block_groups[i])) if (!list_empty(&sinfo->block_groups[i]))
free_bytes += __btrfs_get_ro_block_group_free_space( free_bytes += __btrfs_get_ro_block_group_free_space(
&sinfo->block_groups[i]); &sinfo->block_groups[i]);
@ -8310,7 +8310,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
release_global_block_rsv(info); release_global_block_rsv(info);
while(!list_empty(&info->space_info)) { while (!list_empty(&info->space_info)) {
space_info = list_entry(info->space_info.next, space_info = list_entry(info->space_info.next,
struct btrfs_space_info, struct btrfs_space_info,
list); list);

2
fs/btrfs/extent_io.c
View File

@ -4034,7 +4034,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode,
if (offset >= last) if (offset >= last)
return NULL; return NULL;
while(1) { while (1) {
len = last - offset; len = last - offset;
if (len == 0) if (len == 0)
break; break;

2
fs/btrfs/file.c
View File

@ -369,7 +369,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
u64 root_objectid = 0; u64 root_objectid = 0;
atomic_inc(&fs_info->defrag_running); atomic_inc(&fs_info->defrag_running);
while(1) { while (1) {
/* Pause the auto defragger. */ /* Pause the auto defragger. */
if (test_bit(BTRFS_FS_STATE_REMOUNTING, if (test_bit(BTRFS_FS_STATE_REMOUNTING,
&fs_info->fs_state)) &fs_info->fs_state))

2
fs/btrfs/free-space-cache.c
View File

@ -2280,7 +2280,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
goto out; goto out;
entry = rb_entry(node, struct btrfs_free_space, offset_index); entry = rb_entry(node, struct btrfs_free_space, offset_index);
while(1) { while (1) {
if (entry->bytes < bytes && entry->bytes > *max_extent_size) if (entry->bytes < bytes && entry->bytes > *max_extent_size)
*max_extent_size = entry->bytes; *max_extent_size = entry->bytes;

6
fs/btrfs/inode.c
View File

@ -6262,7 +6262,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag
/* adjust the range_start to make sure it doesn't /* adjust the range_start to make sure it doesn't
* go backwards from the start they passed in * go backwards from the start they passed in
*/ */
range_start = max(start,range_start); range_start = max(start, range_start);
found = found_end - range_start; found = found_end - range_start;
if (found > 0) { if (found > 0) {
@ -7066,7 +7066,7 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip,
} }
} else { } else {
submit_len += bvec->bv_len; submit_len += bvec->bv_len;
nr_pages ++; nr_pages++;
bvec++; bvec++;
} }
} }
@ -8367,7 +8367,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
int err; int err;
int drop_inode = 0; int drop_inode = 0;
u64 objectid; u64 objectid;
u64 index = 0 ; u64 index = 0;
int name_len; int name_len;
int datasize; int datasize;
unsigned long ptr; unsigned long ptr;

14
fs/btrfs/ioctl.c
View File

@ -686,7 +686,7 @@ static inline int btrfs_check_sticky(struct inode *dir, struct inode *inode)
* nfs_async_unlink(). * nfs_async_unlink().
*/ */
static int btrfs_may_delete(struct inode *dir,struct dentry *victim,int isdir) static int btrfs_may_delete(struct inode *dir, struct dentry *victim, int isdir)
{ {
int error; int error;
@ -856,7 +856,7 @@ static int find_new_extents(struct btrfs_root *root,
path->keep_locks = 1; path->keep_locks = 1;
while(1) { while (1) {
ret = btrfs_search_forward(root, &min_key, path, newer_than); ret = btrfs_search_forward(root, &min_key, path, newer_than);
if (ret != 0) if (ret != 0)
goto none; goto none;
@ -1918,7 +1918,7 @@ static noinline int search_ioctl(struct inode *inode,
path->keep_locks = 1; path->keep_locks = 1;
while(1) { while (1) {
ret = btrfs_search_forward(root, &key, path, sk->min_transid); ret = btrfs_search_forward(root, &key, path, sk->min_transid);
if (ret != 0) { if (ret != 0) {
if (ret > 0) if (ret > 0)
@ -2004,7 +2004,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
key.type = BTRFS_INODE_REF_KEY; key.type = BTRFS_INODE_REF_KEY;
key.offset = (u64)-1; key.offset = (u64)-1;
while(1) { while (1) {
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -2033,7 +2033,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
} }
*(ptr + len) = '/'; *(ptr + len) = '/';
read_extent_buffer(l, ptr,(unsigned long)(iref + 1), len); read_extent_buffer(l, ptr, (unsigned long)(iref + 1), len);
if (key.offset == BTRFS_FIRST_FREE_OBJECTID) if (key.offset == BTRFS_FIRST_FREE_OBJECTID)
break; break;
@ -2044,7 +2044,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
dirid = key.objectid; dirid = key.objectid;
} }
memmove(name, ptr, total_len); memmove(name, ptr, total_len);
name[total_len]='\0'; name[total_len] = '\0';
ret = 0; ret = 0;
out: out:
btrfs_free_path(path); btrfs_free_path(path);
@ -2130,7 +2130,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
inode = dentry->d_inode; inode = dentry->d_inode;
dest = BTRFS_I(inode)->root; dest = BTRFS_I(inode)->root;
if (!capable(CAP_SYS_ADMIN)){ if (!capable(CAP_SYS_ADMIN)) {
/* /*
* Regular user. Only allow this with a special mount * Regular user. Only allow this with a special mount
* option, when the user has write+exec access to the * option, when the user has write+exec access to the