diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-04-29 10:01:28 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-29 10:01:28 -0700 |
| commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
| tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /fs/xfs/xfs_inode.c | |
| parent | regulator: tps65090: Allow setting the overcurrent wait time (diff) | |
| parent | mfd: tps65090: Stop caching most registers (diff) | |
| download | wireguard-linux-3e93457b45a1a8c69227ce596ee2005fa06f20dd.tar.xz wireguard-linux-3e93457b45a1a8c69227ce596ee2005fa06f20dd.zip | |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to '')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5e7a38fa6ee6..768087bedbac 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1334,7 +1334,8 @@ int xfs_create_tmpfile( struct xfs_inode *dp, struct dentry *dentry, - umode_t mode) + umode_t mode, + struct xfs_inode **ipp) { struct xfs_mount *mp = dp->i_mount; struct xfs_inode *ip = NULL; @@ -1402,7 +1403,6 @@ xfs_create_tmpfile( xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp); ip->i_d.di_nlink--; - d_tmpfile(dentry, VFS_I(ip)); error = xfs_iunlink(tp, ip); if (error) goto out_trans_abort; @@ -1415,6 +1415,7 @@ xfs_create_tmpfile( xfs_qm_dqrele(gdqp); xfs_qm_dqrele(pdqp); + *ipp = ip; return 0; out_trans_abort: |