diff options
| author | Linus Torvalds | 2010-06-05 06:12:39 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-06-05 06:12:39 +0200 |
| commit | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (patch) | |
| tree | bf68721fb65b64392177f498a9ba61ef027b2b3d /drivers/infiniband | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | Minix: Clean up left over label (diff) | |
| download | kernel-qcow2-linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.tar.gz kernel-qcow2-linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.tar.xz kernel-qcow2-linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Minix: Clean up left over label
fix truncate inode time modification breakage
fix setattr error handling in sysfs, configfs
fcntl: return -EFAULT if copy_to_user fails
wrong type for 'magic' argument in simple_fill_super()
fix the deadlock in qib_fs
mqueue doesn't need make_bad_inode()
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_fs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index edef8527eb34..844954bf417b 100644 --- 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); } |