On Wed, Sep 26, 2018 at 03:14:44AM -0700, Allison Henderson wrote: > Modify xfs_ialloc to hold locks after return. Caller > will be responsible for manual unlock. We will need > this later to hold locks across parent pointer operations > > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx> > --- > fs/xfs/xfs_inode.c | 6 +++++- > fs/xfs/xfs_qm.c | 1 + > fs/xfs/xfs_symlink.c | 3 +++ > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index d957a46..1ef9d03 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -744,6 +744,8 @@ xfs_lookup( > * to attach to or associate with (i.e. pip == NULL) because they > * are not linked into the directory structure - they are attached > * directly to the superblock - and so have no parent. > + * > + * Caller is responsible for unlocking the inode manually upon return > */ > static int > xfs_ialloc( > @@ -942,7 +944,7 @@ xfs_ialloc( > /* > * Log the new values stuffed into the inode. > */ > - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); > + xfs_trans_ijoin(tp, ip, 0); > xfs_trans_log_inode(tp, ip, flags); > > /* now that we have an i_mode we can setup the inode structure */ > @@ -1264,6 +1266,7 @@ xfs_create( > xfs_qm_dqrele(pdqp); > > *ipp = ip; > + xfs_iunlock(ip, XFS_ILOCK_EXCL); > return 0; > > out_trans_cancel: > @@ -1359,6 +1362,7 @@ xfs_create_tmpfile( > xfs_qm_dqrele(pdqp); > > *ipp = ip; > + xfs_iunlock(ip, XFS_ILOCK_EXCL); > return 0; > > out_trans_cancel: It looks like the error paths that get run after a successful call to xfs_dir_ialloc() don't unlock the inode correctly. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx
