projects
/
cascardo
/
linux.git
/ 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://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[cascardo/linux.git]
/
fs
/
btrfs
/
volumes.h
diff --git
a/fs/btrfs/volumes.h
b/fs/btrfs/volumes.h
index
7af6144
..
7fb59d4
100644
(file)
--- a/
fs/btrfs/volumes.h
+++ b/
fs/btrfs/volumes.h
@@
-45,7
+45,6
@@
struct btrfs_device {
int running_pending;
u64 generation;
- int barriers;
int writeable;
int in_fs_metadata;
int missing;
@@
-54,7
+53,7
@@
struct btrfs_device {
struct block_device *bdev;
- /* the mode sent to
open_bdev_exclusive
*/
+ /* the mode sent to
blkdev_get
*/
fmode_t mode;
char *name;