diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 11:21:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 11:21:26 -0700 |
commit | 8942230a7e1c5277969adb0fbaad50dec9b4651b (patch) | |
tree | 680e9a8ac12c04023dda3c3be03b1aad637320d4 | |
parent | bc67b17eb91ea6a2b6d943bb64cde8d1438a11ec (diff) | |
parent | 1fb254aa983bf190cfd685d40c64a480a9bafaee (diff) | |
download | linux-8942230a7e1c5277969adb0fbaad50dec9b4651b.tar.gz linux-8942230a7e1c5277969adb0fbaad50dec9b4651b.tar.bz2 linux-8942230a7e1c5277969adb0fbaad50dec9b4651b.zip |
Merge tag 'xfs-5.3-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fix from Darrick Wong:
"A single patch that fixes a xfs lockup problem when a chown/chgrp
operation fails due to running out of quota. It has survived the usual
xfstests runs and merges cleanly with this morning's master:
- Fix a forgotten inode unlock when chown/chgrp fail due to quota"
* tag 'xfs-5.3-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT
-rw-r--r-- | fs/xfs/xfs_iops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index ff3c1fae5357..fe285d123d69 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -793,6 +793,7 @@ xfs_setattr_nonsize( out_cancel: xfs_trans_cancel(tp); + xfs_iunlock(ip, XFS_ILOCK_EXCL); out_dqrele: xfs_qm_dqrele(udqp); xfs_qm_dqrele(gdqp); |