git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6]
/
fs
/
btrfs
/
volumes.c
diff --git
a/fs/btrfs/volumes.c
b/fs/btrfs/volumes.c
index
4053fc4
..
d6e3af8
100644
(file)
--- a/
fs/btrfs/volumes.c
+++ b/
fs/btrfs/volumes.c
@@
-17,6
+17,7
@@
*/
#include <linux/sched.h>
#include <linux/bio.h>
*/
#include <linux/sched.h>
#include <linux/bio.h>
+#include <linux/slab.h>
#include <linux/buffer_head.h>
#include <linux/blkdev.h>
#include <linux/random.h>
#include <linux/buffer_head.h>
#include <linux/blkdev.h>
#include <linux/random.h>
@@
-256,13
+257,13
@@
loop_lock:
wake_up(&fs_info->async_submit_wait);
BUG_ON(atomic_read(&cur->bi_cnt) == 0);
wake_up(&fs_info->async_submit_wait);
BUG_ON(atomic_read(&cur->bi_cnt) == 0);
- submit_bio(cur->bi_rw, cur);
- num_run++;
- batch_run++;
if (bio_rw_flagged(cur, BIO_RW_SYNCIO))
num_sync_run++;
if (bio_rw_flagged(cur, BIO_RW_SYNCIO))
num_sync_run++;
+ submit_bio(cur->bi_rw, cur);
+ num_run++;
+ batch_run++;
if (need_resched()) {
if (num_sync_run) {
blk_run_backing_dev(bdi, NULL);
if (need_resched()) {
if (num_sync_run) {
blk_run_backing_dev(bdi, NULL);
@@
-1096,7
+1097,7
@@
static int btrfs_rm_dev_item(struct btrfs_root *root,
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
- trans = btrfs_start_transaction(root,
1
);
+ trans = btrfs_start_transaction(root,
0
);
key.objectid = BTRFS_DEV_ITEMS_OBJECTID;
key.type = BTRFS_DEV_ITEM_KEY;
key.offset = device->devid;
key.objectid = BTRFS_DEV_ITEMS_OBJECTID;
key.type = BTRFS_DEV_ITEM_KEY;
key.offset = device->devid;
@@
-1485,7
+1486,7
@@
int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
goto error;
}
goto error;
}
- trans = btrfs_start_transaction(root,
1
);
+ trans = btrfs_start_transaction(root,
0
);
lock_chunks(root);
device->barriers = 1;
lock_chunks(root);
device->barriers = 1;
@@
-1750,9
+1751,10
@@
static int btrfs_relocate_chunk(struct btrfs_root *root,
/* step one, relocate all the extents inside this chunk */
ret = btrfs_relocate_block_group(extent_root, chunk_offset);
/* step one, relocate all the extents inside this chunk */
ret = btrfs_relocate_block_group(extent_root, chunk_offset);
- BUG_ON(ret);
+ if (ret)
+ return ret;
- trans = btrfs_start_transaction(root,
1
);
+ trans = btrfs_start_transaction(root,
0
);
BUG_ON(!trans);
lock_chunks(root);
BUG_ON(!trans);
lock_chunks(root);
@@
-1924,7
+1926,7
@@
int btrfs_balance(struct btrfs_root *dev_root)
break;
BUG_ON(ret);
break;
BUG_ON(ret);
- trans = btrfs_start_transaction(dev_root,
1
);
+ trans = btrfs_start_transaction(dev_root,
0
);
BUG_ON(!trans);
ret = btrfs_grow_device(trans, device, old_size);
BUG_ON(!trans);
ret = btrfs_grow_device(trans, device, old_size);
@@
-2093,11
+2095,7
@@
again:
}
/* Shrinking succeeded, else we would be at "done". */
}
/* Shrinking succeeded, else we would be at "done". */
- trans = btrfs_start_transaction(root, 1);
- if (!trans) {
- ret = -ENOMEM;
- goto done;
- }
+ trans = btrfs_start_transaction(root, 0);
lock_chunks(root);
device->disk_total_bytes = new_size;
lock_chunks(root);
device->disk_total_bytes = new_size;
@@
-2198,9
+2196,9
@@
static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID1)) {
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID1)) {
- num_stripes = min_t(u64, 2, fs_devices->rw_devices);
- if (num_stripes < 2)
+ if (fs_devices->rw_devices < 2)
return -ENOSPC;
return -ENOSPC;
+ num_stripes = 2;
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
min_stripes = 2;
}
if (type & (BTRFS_BLOCK_GROUP_RAID10)) {
@@
-2244,8
+2242,16
@@
again:
do_div(calc_size, stripe_len);
calc_size *= stripe_len;
}
do_div(calc_size, stripe_len);
calc_size *= stripe_len;
}
+
/* we don't want tiny stripes */
/* we don't want tiny stripes */
- calc_size = max_t(u64, min_stripe_size, calc_size);
+ if (!looped)
+ calc_size = max_t(u64, min_stripe_size, calc_size);
+
+ /*
+ * we're about to do_div by the stripe_len so lets make sure
+ * we end up with something bigger than a stripe
+ */
+ calc_size = max_t(u64, calc_size, stripe_len * 4);
do_div(calc_size, stripe_len);
calc_size *= stripe_len;
do_div(calc_size, stripe_len);
calc_size *= stripe_len;
@@
-3389,6
+3395,8
@@
int btrfs_read_chunk_tree(struct btrfs_root *root)
key.type = 0;
again:
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
key.type = 0;
again:
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+ if (ret < 0)
+ goto error;
while (1) {
leaf = path->nodes[0];
slot = path->slots[0];
while (1) {
leaf = path->nodes[0];
slot = path->slots[0];