tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'gfs2-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 updates from Andreas Gruenbacher:

- In the quota code, to avoid spurious audit messages, don't call
capable() when quotas are off

- When changing the 'j' flag of an inode, truncate the inode address
space to avoid mixing "buffer head" and "iomap" pages

* tag 'gfs2-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
gfs2: reorder capability check last

Linus Torvalds 1851bccf b971424b

+3 -2
+1
fs/gfs2/file.c
··· 251 251 error = filemap_fdatawait(inode->i_mapping); 252 252 if (error) 253 253 goto out; 254 + truncate_inode_pages(inode->i_mapping, 0); 254 255 if (new_flags & GFS2_DIF_JDATA) 255 256 gfs2_ordered_del_inode(ip); 256 257 }
+2 -2
fs/gfs2/quota.h
··· 44 44 int ret; 45 45 46 46 ap->allowed = UINT_MAX; /* Assume we are permitted a whole lot */ 47 - if (capable(CAP_SYS_RESOURCE) || 48 - sdp->sd_args.ar_quota == GFS2_QUOTA_OFF) 47 + if (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF || 48 + capable(CAP_SYS_RESOURCE)) 49 49 return 0; 50 50 ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE); 51 51 if (ret)