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
Fix a dumb typo - use of & instead of &&
[safe/jmp/linux-2.6]
/
fs
/
btrfs
/
volumes.h
diff --git
a/fs/btrfs/volumes.h
b/fs/btrfs/volumes.h
index
5836327
..
31b0fab
100644
(file)
--- a/
fs/btrfs/volumes.h
+++ b/
fs/btrfs/volumes.h
@@
-61,6
+61,9
@@
struct btrfs_device {
/* size of the device */
u64 total_bytes;
/* size of the device */
u64 total_bytes;
+ /* size of the disk */
+ u64 disk_total_bytes;
+
/* bytes used */
u64 bytes_used;
/* bytes used */
u64 bytes_used;
@@
-93,7
+96,12
@@
struct btrfs_fs_devices {
u64 rw_devices;
u64 total_rw_bytes;
struct block_device *latest_bdev;
u64 rw_devices;
u64 total_rw_bytes;
struct block_device *latest_bdev;
- /* all of the devices in the FS */
+
+ /* all of the devices in the FS, protected by a mutex
+ * so we can safely walk it to write out the supers without
+ * worrying about add/remove by the multi-device code
+ */
+ struct mutex device_list_mutex;
struct list_head devices;
/* devices not currently being allocated */
struct list_head devices;
/* devices not currently being allocated */
@@
-104,6
+112,11
@@
struct btrfs_fs_devices {
int seeding;
int opened;
int seeding;
int opened;
+
+ /* set when we find or add a device that doesn't have the
+ * nonrot flag set
+ */
+ int rotating;
};
struct btrfs_bio_stripe {
};
struct btrfs_bio_stripe {
@@
-168,4
+181,7
@@
int btrfs_balance(struct btrfs_root *dev_root);
void btrfs_unlock_volumes(void);
void btrfs_lock_volumes(void);
int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
void btrfs_unlock_volumes(void);
void btrfs_lock_volumes(void);
int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
+int find_free_dev_extent(struct btrfs_trans_handle *trans,
+ struct btrfs_device *device, u64 num_bytes,
+ u64 *start, u64 *max_avail);
#endif
#endif