diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-18 11:59:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-18 11:59:38 -0700 |
| commit | a49d273e579615ed63d0347f94075dd22b9458a3 (patch) | |
| tree | 2e8a7ddd3f0f63aec4abf4a6ea344a6a32940a2f /fs/gfs2/quota.h | |
| parent | ce9ecca0238b140b88f43859b211c9fdfd8e5b70 (diff) | |
| parent | fb95d536080e6c1db099f0023f59cd55adcc5d87 (diff) | |
| download | linux-a49d273e579615ed63d0347f94075dd22b9458a3.tar.gz linux-a49d273e579615ed63d0347f94075dd22b9458a3.tar.bz2 linux-a49d273e579615ed63d0347f94075dd22b9458a3.zip | |
Merge tag 'gfs2-v6.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fixes from Andreas Gruenbacher:
- Fix another freeze/thaw hang
- Fix glock cache shrinking
- Fix the quota=quiet mount option
* tag 'gfs2-v6.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Fix quota=quiet oversight
gfs2: fix glock shrinker ref issues
gfs2: Fix another freeze/thaw hang
Diffstat (limited to 'fs/gfs2/quota.h')
| -rw-r--r-- | fs/gfs2/quota.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/quota.h b/fs/gfs2/quota.h index 21ada332d555..1429945215a0 100644 --- a/fs/gfs2/quota.h +++ b/fs/gfs2/quota.h @@ -50,7 +50,8 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip, ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE); if (ret) return ret; - if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON) + if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON && + sdp->sd_args.ar_quota != GFS2_QUOTA_QUIET) return 0; ret = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid, ap); if (ret) |