Isn't this it: https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=4f6257b7d092b84ba8a62769ad6c6fb6ebe89d70 It has been in there 4 days (although I will be updating the branch soon) CIFS: check new file size when extending file by fallocate authorMurphy Zhou <jencce.kernel@xxxxxxxxx> Wed, 18 Mar 2020 07:43:38 -0500 (20:43 +0800) committerSteve French <stfrench@xxxxxxxxxxxxx> Wed, 18 Mar 2020 16:28:10 -0500 (16:28 -0500) commit4f6257b7d092b84ba8a62769ad6c6fb6ebe89d70 tree7faad4e1799cf4bbb3287c8cb93c9fe6cf8ffabf On Sun, Mar 22, 2020 at 7:24 PM Murphy Zhou <jencce.kernel@xxxxxxxxx> wrote: > > Hi Steve, > > On Wed, Mar 18, 2020 at 10:36:54PM -0500, Steve French wrote: > > Merged into cifs-2.6.git for-next > > I don't see this in for-next. Is it for 5.7? > > So does this one: > cifs: allow unlock flock and OFD lock across fork > > Thanks! > > > > On Wed, Mar 18, 2020, 07:48 Murphy Zhou <jencce.kernel@xxxxxxxxx> wrote: > > > > > xfstests generic/228 checks if fallocate respect RLIMIT_FSIZE. > > > After fallocate mode 0 extending enabled, we can hit this failure. > > > Fix this by check the new file size with vfs helper, return > > > error if file size is larger then RLIMIT_FSIZE(ulimit -f). > > > > > > This patch has been tested by LTP/xfstests aginst samba and > > > Windows server. > > > > > > Acked-by: ronnie sahlberg <ronniesahlberg@xxxxxxxxx> > > > Signed-off-by: Murphy Zhou <jencce.kernel@xxxxxxxxx> > > > --- > > > > > > v2: > > > Use (off+len) instead of eof for correct argument type. > > > v3: > > > Fix Ronnie's email address. > > > > > > fs/cifs/smb2ops.c | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c > > > index c31e84ee3c39..f221a01f62bd 100644 > > > --- a/fs/cifs/smb2ops.c > > > +++ b/fs/cifs/smb2ops.c > > > @@ -3246,6 +3246,10 @@ static long smb3_simple_falloc(struct file *file, > > > struct cifs_tcon *tcon, > > > * Extending the file > > > */ > > > if ((keep_size == false) && i_size_read(inode) < off + len) { > > > + rc = inode_newsize_ok(inode, off + len); > > > + if (rc) > > > + goto out; > > > + > > > if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0) > > > smb2_set_sparse(xid, tcon, cfile, inode, false); > > > > > > -- > > > 2.20.1 > > > > > > > > -- > Murphy -- Thanks, Steve
