diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-08-18 10:38:03 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-08-18 10:38:03 -0400 |
| commit | 81d86e1b70961f4816f961875e0c706b0954acad (patch) | |
| tree | ac69ce2e8d174260770d1a84d7d8fe910939c923 /fs/btrfs/volumes.h | |
| parent | 9a4327ca1f45f82edad7dc0a4e52ce9316e0950c (diff) | |
| parent | f1e490a7ebe41e06324abbbcd86005b0af02a375 (diff) | |
Merge branch 'btrfs-3.0' into for-linus
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 7c12d61ae7ae..6d866db4e177 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -48,6 +48,7 @@ struct btrfs_device { int writeable; int in_fs_metadata; int missing; + int can_discard; spinlock_t io_lock; @@ -104,6 +105,7 @@ struct btrfs_fs_devices { u64 rw_devices; u64 missing_devices; u64 total_rw_bytes; + u64 num_can_discard; struct block_device *latest_bdev; /* all of the devices in the FS, protected by a mutex |