fix the deadlock in qib_fs

get_sb_single() calls fill_super with superblock locked; calling
deactivate_super() will deadlock immedately.  Moreover, if fill_super
callback returns an error, get_sb_single() will release the reference
to superblock itself just fine.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index edef8527eb34899a85c4b61fd33605e240bda49c..844954bf417b7cc10fd13a3c103388b4099e8f79 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -542,10 +542,8 @@ static int qibfs_fill_super(struct super_block *sb, void *data, int silent)
        list_for_each_entry_safe(dd, tmp, &qib_dev_list, list) {
                spin_unlock_irqrestore(&qib_devs_lock, flags);
                ret = add_cntr_files(sb, dd);
-               if (ret) {
-                       deactivate_super(sb);
+               if (ret)
                        goto bail;
-               }
                spin_lock_irqsave(&qib_devs_lock, flags);
        }