diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /include/linux/fs.h | |
parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7061a8587ee3..12529e966350 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -662,9 +662,9 @@ struct address_space { | |||
662 | 662 | ||
663 | struct block_device { | 663 | struct block_device { |
664 | dev_t bd_dev; /* not a kdev_t - it's a search key */ | 664 | dev_t bd_dev; /* not a kdev_t - it's a search key */ |
665 | int bd_openers; | ||
665 | struct inode * bd_inode; /* will die */ | 666 | struct inode * bd_inode; /* will die */ |
666 | struct super_block * bd_super; | 667 | struct super_block * bd_super; |
667 | int bd_openers; | ||
668 | struct mutex bd_mutex; /* open/close mutex */ | 668 | struct mutex bd_mutex; /* open/close mutex */ |
669 | struct list_head bd_inodes; | 669 | struct list_head bd_inodes; |
670 | void * bd_claiming; | 670 | void * bd_claiming; |