cifs: fix incorrect handling of smb2_set_sparse() return in smb3_simple_falloc
smb2_set_sparse does not return -errno, it returns a boolean where true means success. Change this to just ignore the return value just like the other callsites. Additionally add code to handle the case where we must set the file sparse and possibly also extending it. Fixes xfstests: generic/236 generic/350 generic/420 Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Родитель
dd0ac2d24b
Коммит
f16994797e
|
@ -2718,6 +2718,7 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
|
|||
struct cifsFileInfo *cfile = file->private_data;
|
||||
long rc = -EOPNOTSUPP;
|
||||
unsigned int xid;
|
||||
__le64 eof;
|
||||
|
||||
xid = get_xid();
|
||||
|
||||
|
@ -2777,9 +2778,18 @@ static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
|
|||
return rc;
|
||||
}
|
||||
|
||||
rc = smb2_set_sparse(xid, tcon, cfile, inode, false);
|
||||
smb2_set_sparse(xid, tcon, cfile, inode, false);
|
||||
rc = 0;
|
||||
} else {
|
||||
smb2_set_sparse(xid, tcon, cfile, inode, false);
|
||||
rc = 0;
|
||||
if (i_size_read(inode) < off + len) {
|
||||
eof = cpu_to_le64(off + len);
|
||||
rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
|
||||
cfile->fid.volatile_fid, cfile->pid,
|
||||
&eof);
|
||||
}
|
||||
}
|
||||
/* BB: else ... in future add code to extend file and set sparse */
|
||||
|
||||
if (rc)
|
||||
trace_smb3_falloc_err(xid, cfile->fid.persistent_fid, tcon->tid,
|
||||
|
|
Загрузка…
Ссылка в новой задаче