Commit 34cd86b6 authored by Marios Makassikis's avatar Marios Makassikis Committed by Steve French

ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info

Use vfs_getattr() to retrieve stat information, rather than make
assumptions about how a filesystem fills inode structs.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarios Makassikis <mmakassikis@freebox.fr>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 5614c8c4
...@@ -5809,15 +5809,21 @@ static int set_file_allocation_info(struct ksmbd_work *work, ...@@ -5809,15 +5809,21 @@ static int set_file_allocation_info(struct ksmbd_work *work,
loff_t alloc_blks; loff_t alloc_blks;
struct inode *inode; struct inode *inode;
struct kstat stat;
int rc; int rc;
if (!(fp->daccess & FILE_WRITE_DATA_LE)) if (!(fp->daccess & FILE_WRITE_DATA_LE))
return -EACCES; return -EACCES;
rc = vfs_getattr(&fp->filp->f_path, &stat, STATX_BASIC_STATS,
AT_STATX_SYNC_AS_STAT);
if (rc)
return rc;
alloc_blks = (le64_to_cpu(file_alloc_info->AllocationSize) + 511) >> 9; alloc_blks = (le64_to_cpu(file_alloc_info->AllocationSize) + 511) >> 9;
inode = file_inode(fp->filp); inode = file_inode(fp->filp);
if (alloc_blks > inode->i_blocks) { if (alloc_blks > stat.blocks) {
smb_break_all_levII_oplock(work, fp, 1); smb_break_all_levII_oplock(work, fp, 1);
rc = vfs_fallocate(fp->filp, FALLOC_FL_KEEP_SIZE, 0, rc = vfs_fallocate(fp->filp, FALLOC_FL_KEEP_SIZE, 0,
alloc_blks * 512); alloc_blks * 512);
...@@ -5825,7 +5831,7 @@ static int set_file_allocation_info(struct ksmbd_work *work, ...@@ -5825,7 +5831,7 @@ static int set_file_allocation_info(struct ksmbd_work *work,
pr_err("vfs_fallocate is failed : %d\n", rc); pr_err("vfs_fallocate is failed : %d\n", rc);
return rc; return rc;
} }
} else if (alloc_blks < inode->i_blocks) { } else if (alloc_blks < stat.blocks) {
loff_t size; loff_t size;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment