aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/btrfs/async-thread.c2
-rw-r--r--fs/btrfs/compression.c2
-rw-r--r--fs/btrfs/ctree.c2
-rw-r--r--fs/btrfs/extent-tree.c6
-rw-r--r--fs/btrfs/extent_io.c2
-rw-r--r--fs/btrfs/file.c2
-rw-r--r--fs/btrfs/free-space-cache.c2
-rw-r--r--fs/btrfs/inode.c6
-rw-r--r--fs/btrfs/ioctl.c14
9 files changed, 19 insertions, 19 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 08cc08f037a6..8aec751fa464 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -262,7 +262,7 @@ static struct btrfs_work *get_next_work(struct btrfs_worker_thread *worker,
262 struct btrfs_work *work = NULL; 262 struct btrfs_work *work = NULL;
263 struct list_head *cur = NULL; 263 struct list_head *cur = NULL;
264 264
265 if(!list_empty(prio_head)) 265 if (!list_empty(prio_head))
266 cur = prio_head->next; 266 cur = prio_head->next;
267 267
268 smp_mb(); 268 smp_mb();
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index df019c7f58b2..1499b27b4186 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -359,7 +359,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
359 bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev; 359 bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
360 360
361 bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS); 361 bio = compressed_bio_alloc(bdev, first_byte, GFP_NOFS);
362 if(!bio) { 362 if (!bio) {
363 kfree(cb); 363 kfree(cb);
364 return -ENOMEM; 364 return -ENOMEM;
365 } 365 }
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 03c606cefd50..316136bd6dd7 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -4018,7 +4018,7 @@ again:
4018 data_size > BTRFS_LEAF_DATA_SIZE(root)) { 4018 data_size > BTRFS_LEAF_DATA_SIZE(root)) {
4019 if (data_size && !tried_avoid_double) 4019 if (data_size && !tried_avoid_double)
4020 goto push_for_double; 4020 goto push_for_double;
4021 split = 2 ; 4021 split = 2;
4022 } 4022 }
4023 } 4023 }
4024 } 4024 }
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 2d58461bd035..fb5c76795eda 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5017,7 +5017,7 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
5017 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex); 5017 mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
5018 5018
5019 if (to_reserve) 5019 if (to_reserve)
5020 trace_btrfs_space_reservation(root->fs_info,"delalloc", 5020 trace_btrfs_space_reservation(root->fs_info, "delalloc",
5021 btrfs_ino(inode), to_reserve, 1); 5021 btrfs_ino(inode), to_reserve, 1);
5022 block_rsv_add_bytes(block_rsv, to_reserve, 1); 5022 block_rsv_add_bytes(block_rsv, to_reserve, 1);
5023 5023
@@ -8022,7 +8022,7 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)
8022 8022
8023 spin_lock(&sinfo->lock); 8023 spin_lock(&sinfo->lock);
8024 8024
8025 for(i = 0; i < BTRFS_NR_RAID_TYPES; i++) 8025 for (i = 0; i < BTRFS_NR_RAID_TYPES; i++)
8026 if (!list_empty(&sinfo->block_groups[i])) 8026 if (!list_empty(&sinfo->block_groups[i]))
8027 free_bytes += __btrfs_get_ro_block_group_free_space( 8027 free_bytes += __btrfs_get_ro_block_group_free_space(
8028 &sinfo->block_groups[i]); 8028 &sinfo->block_groups[i]);
@@ -8310,7 +8310,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
8310 8310
8311 release_global_block_rsv(info); 8311 release_global_block_rsv(info);
8312 8312
8313 while(!list_empty(&info->space_info)) { 8313 while (!list_empty(&info->space_info)) {
8314 space_info = list_entry(info->space_info.next, 8314 space_info = list_entry(info->space_info.next,
8315 struct btrfs_space_info, 8315 struct btrfs_space_info,
8316 list); 8316 list);
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index fb782ed62426..856bc2b2192c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4034,7 +4034,7 @@ static struct extent_map *get_extent_skip_holes(struct inode *inode,
4034 if (offset >= last) 4034 if (offset >= last)
4035 return NULL; 4035 return NULL;
4036 4036
4037 while(1) { 4037 while (1) {
4038 len = last - offset; 4038 len = last - offset;
4039 if (len == 0) 4039 if (len == 0)
4040 break; 4040 break;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 3a20a12513b2..82d0342763c5 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -369,7 +369,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
369 u64 root_objectid = 0; 369 u64 root_objectid = 0;
370 370
371 atomic_inc(&fs_info->defrag_running); 371 atomic_inc(&fs_info->defrag_running);
372 while(1) { 372 while (1) {
373 /* Pause the auto defragger. */ 373 /* Pause the auto defragger. */
374 if (test_bit(BTRFS_FS_STATE_REMOUNTING, 374 if (test_bit(BTRFS_FS_STATE_REMOUNTING,
375 &fs_info->fs_state)) 375 &fs_info->fs_state))
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d7c445c30a16..057be95b1e1e 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2280,7 +2280,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
2280 goto out; 2280 goto out;
2281 2281
2282 entry = rb_entry(node, struct btrfs_free_space, offset_index); 2282 entry = rb_entry(node, struct btrfs_free_space, offset_index);
2283 while(1) { 2283 while (1) {
2284 if (entry->bytes < bytes && entry->bytes > *max_extent_size) 2284 if (entry->bytes < bytes && entry->bytes > *max_extent_size)
2285 *max_extent_size = entry->bytes; 2285 *max_extent_size = entry->bytes;
2286 2286
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ddecc9c332f4..57fa19d69e90 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6262,7 +6262,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag
6262 /* adjust the range_start to make sure it doesn't 6262 /* adjust the range_start to make sure it doesn't
6263 * go backwards from the start they passed in 6263 * go backwards from the start they passed in
6264 */ 6264 */
6265 range_start = max(start,range_start); 6265 range_start = max(start, range_start);
6266 found = found_end - range_start; 6266 found = found_end - range_start;
6267 6267
6268 if (found > 0) { 6268 if (found > 0) {
@@ -7066,7 +7066,7 @@ static int btrfs_submit_direct_hook(int rw, struct btrfs_dio_private *dip,
7066 } 7066 }
7067 } else { 7067 } else {
7068 submit_len += bvec->bv_len; 7068 submit_len += bvec->bv_len;
7069 nr_pages ++; 7069 nr_pages++;
7070 bvec++; 7070 bvec++;
7071 } 7071 }
7072 } 7072 }
@@ -8367,7 +8367,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
8367 int err; 8367 int err;
8368 int drop_inode = 0; 8368 int drop_inode = 0;
8369 u64 objectid; 8369 u64 objectid;
8370 u64 index = 0 ; 8370 u64 index = 0;
8371 int name_len; 8371 int name_len;
8372 int datasize; 8372 int datasize;
8373 unsigned long ptr; 8373 unsigned long ptr;
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 3712ef86ca82..6523108d2984 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -686,7 +686,7 @@ static inline int btrfs_check_sticky(struct inode *dir, struct inode *inode)
686 * nfs_async_unlink(). 686 * nfs_async_unlink().
687 */ 687 */
688 688
689static int btrfs_may_delete(struct inode *dir,struct dentry *victim,int isdir) 689static int btrfs_may_delete(struct inode *dir, struct dentry *victim, int isdir)
690{ 690{
691 int error; 691 int error;
692 692
@@ -856,7 +856,7 @@ static int find_new_extents(struct btrfs_root *root,
856 856
857 path->keep_locks = 1; 857 path->keep_locks = 1;
858 858
859 while(1) { 859 while (1) {
860 ret = btrfs_search_forward(root, &min_key, path, newer_than); 860 ret = btrfs_search_forward(root, &min_key, path, newer_than);
861 if (ret != 0) 861 if (ret != 0)
862 goto none; 862 goto none;
@@ -1918,7 +1918,7 @@ static noinline int search_ioctl(struct inode *inode,
1918 1918
1919 path->keep_locks = 1; 1919 path->keep_locks = 1;
1920 1920
1921 while(1) { 1921 while (1) {
1922 ret = btrfs_search_forward(root, &key, path, sk->min_transid); 1922 ret = btrfs_search_forward(root, &key, path, sk->min_transid);
1923 if (ret != 0) { 1923 if (ret != 0) {
1924 if (ret > 0) 1924 if (ret > 0)
@@ -2004,7 +2004,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
2004 key.type = BTRFS_INODE_REF_KEY; 2004 key.type = BTRFS_INODE_REF_KEY;
2005 key.offset = (u64)-1; 2005 key.offset = (u64)-1;
2006 2006
2007 while(1) { 2007 while (1) {
2008 ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); 2008 ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
2009 if (ret < 0) 2009 if (ret < 0)
2010 goto out; 2010 goto out;
@@ -2033,7 +2033,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
2033 } 2033 }
2034 2034
2035 *(ptr + len) = '/'; 2035 *(ptr + len) = '/';
2036 read_extent_buffer(l, ptr,(unsigned long)(iref + 1), len); 2036 read_extent_buffer(l, ptr, (unsigned long)(iref + 1), len);
2037 2037
2038 if (key.offset == BTRFS_FIRST_FREE_OBJECTID) 2038 if (key.offset == BTRFS_FIRST_FREE_OBJECTID)
2039 break; 2039 break;
@@ -2044,7 +2044,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
2044 dirid = key.objectid; 2044 dirid = key.objectid;
2045 } 2045 }
2046 memmove(name, ptr, total_len); 2046 memmove(name, ptr, total_len);
2047 name[total_len]='\0'; 2047 name[total_len] = '\0';
2048 ret = 0; 2048 ret = 0;
2049out: 2049out:
2050 btrfs_free_path(path); 2050 btrfs_free_path(path);
@@ -2130,7 +2130,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
2130 2130
2131 inode = dentry->d_inode; 2131 inode = dentry->d_inode;
2132 dest = BTRFS_I(inode)->root; 2132 dest = BTRFS_I(inode)->root;
2133 if (!capable(CAP_SYS_ADMIN)){ 2133 if (!capable(CAP_SYS_ADMIN)) {
2134 /* 2134 /*
2135 * Regular user. Only allow this with a special mount 2135 * Regular user. Only allow this with a special mount
2136 * option, when the user has write+exec access to the 2136 * option, when the user has write+exec access to the