diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 15:14:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 15:14:44 -0700 |
| commit | b983471794e568fd71fa767da77a62ba517c3e63 (patch) | |
| tree | 92a1cc26c4846b49d90225d004ba1b7bd6fe3d81 /fs/btrfs/volumes.h | |
| parent | 5a3ae276057840f0e60664c12fc3ef80aa59d1d4 (diff) | |
| parent | c293498be69816087746161338de4b81efdf69fc (diff) | |
| download | kernel_samsung_tuna-b983471794e568fd71fa767da77a62ba517c3e63.zip kernel_samsung_tuna-b983471794e568fd71fa767da77a62ba517c3e63.tar.gz kernel_samsung_tuna-b983471794e568fd71fa767da77a62ba517c3e63.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: BUG to BUG_ON changes
Btrfs: remove dead code
Btrfs: remove dead code
Btrfs: fix typos in comments
Btrfs: remove unused ftrace include
Btrfs: fix __ucmpdi2 compile bug on 32 bit builds
Btrfs: free inode struct when btrfs_new_inode fails
Btrfs: fix race in worker_loop
Btrfs: add flushoncommit mount option
Btrfs: notreelog mount option
Btrfs: introduce btrfs_show_options
Btrfs: rework allocation clustering
Btrfs: Optimize locking in btrfs_next_leaf()
Btrfs: break up btrfs_search_slot into smaller pieces
Btrfs: kill the pinned_mutex
Btrfs: kill the block group alloc mutex
Btrfs: clean up find_free_extent
Btrfs: free space cache cleanups
Btrfs: unplug in the async bio submission threads
Btrfs: keep processing bios for a given bdev if our proc is batching
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 86c44e9..2185de7 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -76,7 +76,7 @@ struct btrfs_device { struct btrfs_fs_devices { u8 fsid[BTRFS_FSID_SIZE]; /* FS specific uuid */ - /* the device with this id has the most recent coyp of the super */ + /* the device with this id has the most recent copy of the super */ u64 latest_devid; u64 latest_trans; u64 num_devices; |