From 86508208acdeeb9afe8150dc558ae552700ad00b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 28 May 2010 21:32:44 -0400 Subject: [PATCH] --- yaml --- r: 200131 b: refs/heads/master c: 971b2e8a3f5dc0cbef19ec1a77b6d20237aa751e h: refs/heads/master i: 200129: a1c825ee2e7c54f8cade50c6ac90af19ded97a1d 200127: 2aa255b6dde7d7ad5e106a27bc3582cf3933e341 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_fs.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e52f8e95f3b6..911dd7bb51ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0abbb609ac511fc226b8b1082613193c8ecf8324 +refs/heads/master: 971b2e8a3f5dc0cbef19ec1a77b6d20237aa751e diff --git a/trunk/drivers/infiniband/hw/qib/qib_fs.c b/trunk/drivers/infiniband/hw/qib/qib_fs.c index edef8527eb34..844954bf417b 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_fs.c +++ b/trunk/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); }