merged into cifs-2.6.git for-next (but fixed Signed-off-by email address to match Author email address) On Tue, Aug 20, 2024 at 10:13 AM <chenxiaosong@xxxxxxxxxxxxxxxx> wrote: > > From: ChenXiaoSong <chenxiaosong@xxxxxxxxxx> > > Preparation for moving the SMB2 Status code definitions to a common > header file. > > Signed-off-by: ChenXiaoSong <chenxiaosong@xxxxxxxxxxxxxxxx> > --- > fs/smb/client/smb2maperror.c | 2 +- > fs/smb/client/smb2status.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c > index ac1895358908..3ac17d43bb7d 100644 > --- a/fs/smb/client/smb2maperror.c > +++ b/fs/smb/client/smb2maperror.c > @@ -1096,7 +1096,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { > "STATUS_MOUNT_POINT_NOT_RESOLVED"}, > {STATUS_INVALID_DEVICE_OBJECT_PARAMETER, -EIO, > "STATUS_INVALID_DEVICE_OBJECT_PARAMETER"}, > - {STATUS_MCA_OCCURED, -EIO, "STATUS_MCA_OCCURED"}, > + {STATUS_MCA_OCCURRED, -EIO, "STATUS_MCA_OCCURRED"}, > {STATUS_DRIVER_BLOCKED_CRITICAL, -EIO, > "STATUS_DRIVER_BLOCKED_CRITICAL"}, > {STATUS_DRIVER_BLOCKED, -EIO, "STATUS_DRIVER_BLOCKED"}, > diff --git a/fs/smb/client/smb2status.h b/fs/smb/client/smb2status.h > index 9c6d79b0bd49..15364c4328ec 100644 > --- a/fs/smb/client/smb2status.h > +++ b/fs/smb/client/smb2status.h > @@ -901,7 +901,7 @@ struct ntstatus { > #define STATUS_DEVICE_ENUMERATION_ERROR cpu_to_le32(0xC0000366) > #define STATUS_MOUNT_POINT_NOT_RESOLVED cpu_to_le32(0xC0000368) > #define STATUS_INVALID_DEVICE_OBJECT_PARAMETER cpu_to_le32(0xC0000369) > -#define STATUS_MCA_OCCURED cpu_to_le32(0xC000036A) > +#define STATUS_MCA_OCCURRED cpu_to_le32(0xC000036A) > #define STATUS_DRIVER_BLOCKED_CRITICAL cpu_to_le32(0xC000036B) > #define STATUS_DRIVER_BLOCKED cpu_to_le32(0xC000036C) > #define STATUS_DRIVER_DATABASE_ERROR cpu_to_le32(0xC000036D) > -- > 2.34.1 > > -- Thanks, Steve