diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 10:59:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 10:59:36 +1000 |
| commit | 914e22e15eb378c95af95fe02783e1773f8cf212 (patch) | |
| tree | 88a62019159a97c245c352a7d18e2c302991d933 | |
| parent | a659bf39c4e0d25baaf612d6816f761af4a5fd0f (diff) | |
| parent | dfb3856befc852898571b7591130aff37d87434c (diff) | |
Merge remote branch 'vfs/for-next'
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_fs.c | 4 | ||||
| -rw-r--r-- | ipc/mqueue.c | 1 |
2 files changed, 1 insertions, 4 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); } diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 5108232f93d4..c93fd3faac2d 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -176,7 +176,6 @@ static struct inode *mqueue_get_inode(struct super_block *sb, } return inode; out_inode: - make_bad_inode(inode); iput(inode); return NULL; } |