diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /fs/btrfs/volumes.h | |
| parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
| parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
| download | linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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 2b638b6e4eea..2740db49eb04 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -44,6 +44,7 @@ struct btrfs_device { int writeable; int in_fs_metadata; + int missing; spinlock_t io_lock; @@ -93,6 +94,7 @@ struct btrfs_fs_devices { u64 num_devices; u64 open_devices; u64 rw_devices; + u64 missing_devices; u64 total_rw_bytes; struct block_device *latest_bdev; |