Commit 02655a70 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French

ksmbd: set fixed sector size to FS_SECTOR_SIZE_INFORMATION

Currently ksmbd is using ->f_bsize from vfs_statfs() as sector size.
If fat/exfat is a local share, ->f_bsize is a cluster size that is too
large to be used as a sector size. Sector sizes larger than 4K cause
problem occurs when mounting an iso file through windows client.

The error message can be obtained using Mount-DiskImage command,
 the error is:
"Mount-DiskImage : The sector size of the physical disk on which the
virtual disk resides is not supported."

This patch reports fixed 4KB sector size if ->s_blocksize is bigger
than 4KB.
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 8510a043
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/statfs.h> #include <linux/statfs.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/falloc.h> #include <linux/falloc.h>
#include <linux/mount.h>
#include "glob.h" #include "glob.h"
#include "smbfsctl.h" #include "smbfsctl.h"
...@@ -4995,15 +4996,17 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work, ...@@ -4995,15 +4996,17 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,
case FS_SECTOR_SIZE_INFORMATION: case FS_SECTOR_SIZE_INFORMATION:
{ {
struct smb3_fs_ss_info *info; struct smb3_fs_ss_info *info;
unsigned int sector_size =
min_t(unsigned int, path.mnt->mnt_sb->s_blocksize, 4096);
info = (struct smb3_fs_ss_info *)(rsp->Buffer); info = (struct smb3_fs_ss_info *)(rsp->Buffer);
info->LogicalBytesPerSector = cpu_to_le32(stfs.f_bsize); info->LogicalBytesPerSector = cpu_to_le32(sector_size);
info->PhysicalBytesPerSectorForAtomicity = info->PhysicalBytesPerSectorForAtomicity =
cpu_to_le32(stfs.f_bsize); cpu_to_le32(sector_size);
info->PhysicalBytesPerSectorForPerf = cpu_to_le32(stfs.f_bsize); info->PhysicalBytesPerSectorForPerf = cpu_to_le32(sector_size);
info->FSEffPhysicalBytesPerSectorForAtomicity = info->FSEffPhysicalBytesPerSectorForAtomicity =
cpu_to_le32(stfs.f_bsize); cpu_to_le32(sector_size);
info->Flags = cpu_to_le32(SSINFO_FLAGS_ALIGNED_DEVICE | info->Flags = cpu_to_le32(SSINFO_FLAGS_ALIGNED_DEVICE |
SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE); SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE);
info->ByteOffsetForSectorAlignment = 0; info->ByteOffsetForSectorAlignment = 0;
......
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