diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
| commit | 3cabb836d801c3ad791c2dc6be07ec5819ab0a37 (patch) | |
| tree | dbc5bff557d23e978fd3c8920c7d99d8c09fa272 /fs/xfs/xfs_inode.c | |
| parent | 83d5f01858b56db69c8e4ca5389ef7c29bfdb5dd (diff) | |
| parent | 444a702231412e82fb1c09679adc159301e9242c (diff) | |
| download | op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.zip op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.1' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 6163767..698da03 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -818,7 +818,7 @@ xfs_ialloc( xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); xfs_trans_log_inode(tp, ip, flags); - /* now that we have an i_mode we can setup inode ops and unlock */ + /* now that we have an i_mode we can setup the inode structure */ xfs_setup_inode(ip); *ipp = ip; @@ -1235,12 +1235,14 @@ xfs_create( xfs_trans_cancel(tp, cancel_flags); out_release_inode: /* - * Wait until after the current transaction is aborted to - * release the inode. This prevents recursive transactions - * and deadlocks from xfs_inactive. + * Wait until after the current transaction is aborted to finish the + * setup of the inode and release the inode. This prevents recursive + * transactions and deadlocks from xfs_inactive. */ - if (ip) + if (ip) { + xfs_finish_inode_setup(ip); IRELE(ip); + } xfs_qm_dqrele(udqp); xfs_qm_dqrele(gdqp); @@ -1345,12 +1347,14 @@ xfs_create_tmpfile( xfs_trans_cancel(tp, cancel_flags); out_release_inode: /* - * Wait until after the current transaction is aborted to - * release the inode. This prevents recursive transactions - * and deadlocks from xfs_inactive. + * Wait until after the current transaction is aborted to finish the + * setup of the inode and release the inode. This prevents recursive + * transactions and deadlocks from xfs_inactive. */ - if (ip) + if (ip) { + xfs_finish_inode_setup(ip); IRELE(ip); + } xfs_qm_dqrele(udqp); xfs_qm_dqrele(gdqp); |
