[SERIAL] OMAP1510 serial fix for 115200 baud

[linux-2.6-omap-h63xx.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 5a4fe8be462ad998d0f32cdf270f710d210d6326..6987824d0dce0ec94713d3f394e8d2c8535c04aa 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -49,6 +49,7 @@ DEFINE_SPINLOCK(sb_lock);
 
 /**
  *     alloc_super     -       create new superblock
+ *     @type:  filesystem type superblock should belong to
  *
  *     Allocates and initializes a new &struct super_block.  alloc_super()
  *     returns a pointer new superblock or %NULL if allocation had failed.
@@ -72,6 +73,7 @@ static struct super_block *alloc_super(struct file_system_type *type)
                INIT_LIST_HEAD(&s->s_inodes);
                init_rwsem(&s->s_umount);
                mutex_init(&s->s_lock);
+               lockdep_set_class(&s->s_umount, &type->s_umount_key);
                /*
                 * The locking rules for s_lock are up to the
                 * filesystem. For example ext3fs has different
@@ -197,7 +199,7 @@ EXPORT_SYMBOL(deactivate_super);
  *     success, 0 if we had failed (superblock contents was already dead or
  *     dying when grab_super() had been called).
  */
-static int grab_super(struct super_block *s)
+static int grab_super(struct super_block *s) __releases(sb_lock)
 {
        s->s_count++;
        spin_unlock(&sb_lock);