Merge branch 'master' into for-2.6.35

[safe/jmp/linux-2.6] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 44f35ae..f30970c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -651,6 +651,7 @@ struct block_device {
        int                     bd_openers;
        struct mutex            bd_mutex;       /* open/close mutex */
        struct list_head        bd_inodes;
+       void *                  bd_claiming;
        void *                  bd_holder;
        int                     bd_holders;
 #ifdef CONFIG_SYSFS