@@ -713,17 +713,17 @@ static int smb2_get_dos_mode(struct kstat *stat, int attribute)
713
713
int attr = 0 ;
714
714
715
715
if (S_ISDIR (stat -> mode )) {
716
- attr = ATTR_DIRECTORY |
717
- (attribute & (ATTR_HIDDEN | ATTR_SYSTEM ));
716
+ attr = FILE_ATTRIBUTE_DIRECTORY |
717
+ (attribute & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM ));
718
718
} else {
719
- attr = (attribute & 0x00005137 ) | ATTR_ARCHIVE ;
720
- attr &= ~(ATTR_DIRECTORY );
719
+ attr = (attribute & 0x00005137 ) | FILE_ATTRIBUTE_ARCHIVE ;
720
+ attr &= ~(FILE_ATTRIBUTE_DIRECTORY );
721
721
if (S_ISREG (stat -> mode ) && (server_conf .share_fake_fscaps &
722
722
FILE_SUPPORTS_SPARSE_FILES ))
723
- attr |= ATTR_SPARSE ;
723
+ attr |= FILE_ATTRIBUTE_SPARSE_FILE ;
724
724
725
725
if (smb2_get_reparse_tag_special_file (stat -> mode ))
726
- attr |= ATTR_REPARSE ;
726
+ attr |= FILE_ATTRIBUTE_REPARSE_POINT ;
727
727
}
728
728
729
729
return attr ;
@@ -2098,15 +2098,15 @@ static noinline int create_smb2_pipe(struct ksmbd_work *work)
2098
2098
rsp -> hdr .Status = STATUS_SUCCESS ;
2099
2099
rsp -> StructureSize = cpu_to_le16 (89 );
2100
2100
rsp -> OplockLevel = SMB2_OPLOCK_LEVEL_NONE ;
2101
- rsp -> Reserved = 0 ;
2101
+ rsp -> Flags = 0 ;
2102
2102
rsp -> CreateAction = cpu_to_le32 (FILE_OPENED );
2103
2103
2104
2104
rsp -> CreationTime = cpu_to_le64 (0 );
2105
2105
rsp -> LastAccessTime = cpu_to_le64 (0 );
2106
2106
rsp -> ChangeTime = cpu_to_le64 (0 );
2107
2107
rsp -> AllocationSize = cpu_to_le64 (0 );
2108
2108
rsp -> EndofFile = cpu_to_le64 (0 );
2109
- rsp -> FileAttributes = ATTR_NORMAL_LE ;
2109
+ rsp -> FileAttributes = FILE_ATTRIBUTE_NORMAL_LE ;
2110
2110
rsp -> Reserved2 = 0 ;
2111
2111
rsp -> VolatileFileId = cpu_to_le64 (id );
2112
2112
rsp -> PersistentFileId = 0 ;
@@ -2352,7 +2352,7 @@ static void smb2_update_xattrs(struct ksmbd_tree_connect *tcon,
2352
2352
struct xattr_dos_attrib da ;
2353
2353
int rc ;
2354
2354
2355
- fp -> f_ci -> m_fattr &= ~(ATTR_HIDDEN_LE | ATTR_SYSTEM_LE );
2355
+ fp -> f_ci -> m_fattr &= ~(FILE_ATTRIBUTE_HIDDEN_LE | FILE_ATTRIBUTE_SYSTEM_LE );
2356
2356
2357
2357
/* get FileAttributes from XATTR_NAME_DOS_ATTRIBUTE */
2358
2358
if (!test_share_config_flag (tcon -> share_conf ,
@@ -2557,15 +2557,15 @@ int smb2_open(struct ksmbd_work *work)
2557
2557
if (req_op_level == SMB2_OPLOCK_LEVEL_LEASE )
2558
2558
lc = parse_lease_state (req );
2559
2559
2560
- if (le32_to_cpu (req -> ImpersonationLevel ) > le32_to_cpu (IL_DELEGATE_LE )) {
2560
+ if (le32_to_cpu (req -> ImpersonationLevel ) > le32_to_cpu (IL_DELEGATE )) {
2561
2561
pr_err ("Invalid impersonationlevel : 0x%x\n" ,
2562
2562
le32_to_cpu (req -> ImpersonationLevel ));
2563
2563
rc = - EIO ;
2564
2564
rsp -> hdr .Status = STATUS_BAD_IMPERSONATION_LEVEL ;
2565
2565
goto err_out1 ;
2566
2566
}
2567
2567
2568
- if (req -> CreateOptions && !(req -> CreateOptions & CREATE_OPTIONS_MASK )) {
2568
+ if (req -> CreateOptions && !(req -> CreateOptions & CREATE_OPTIONS_MASK_LE )) {
2569
2569
pr_err ("Invalid create options : 0x%x\n" ,
2570
2570
le32_to_cpu (req -> CreateOptions ));
2571
2571
rc = - EINVAL ;
@@ -2607,7 +2607,7 @@ int smb2_open(struct ksmbd_work *work)
2607
2607
goto err_out1 ;
2608
2608
}
2609
2609
2610
- if (req -> FileAttributes && !(req -> FileAttributes & ATTR_MASK_LE )) {
2610
+ if (req -> FileAttributes && !(req -> FileAttributes & FILE_ATTRIBUTE_MASK_LE )) {
2611
2611
pr_err ("Invalid file attribute : 0x%x\n" ,
2612
2612
le32_to_cpu (req -> FileAttributes ));
2613
2613
rc = - EINVAL ;
@@ -2738,7 +2738,7 @@ int smb2_open(struct ksmbd_work *work)
2738
2738
}
2739
2739
2740
2740
if (req -> CreateOptions & FILE_DIRECTORY_FILE_LE &&
2741
- req -> FileAttributes & ATTR_NORMAL_LE ) {
2741
+ req -> FileAttributes & FILE_ATTRIBUTE_NORMAL_LE ) {
2742
2742
rsp -> hdr .Status = STATUS_NOT_A_DIRECTORY ;
2743
2743
rc = - EIO ;
2744
2744
}
@@ -3117,7 +3117,7 @@ int smb2_open(struct ksmbd_work *work)
3117
3117
opinfo = rcu_dereference (fp -> f_opinfo );
3118
3118
rsp -> OplockLevel = opinfo != NULL ? opinfo -> level : 0 ;
3119
3119
rcu_read_unlock ();
3120
- rsp -> Reserved = 0 ;
3120
+ rsp -> Flags = 0 ;
3121
3121
rsp -> CreateAction = cpu_to_le32 (file_info );
3122
3122
rsp -> CreationTime = cpu_to_le64 (fp -> create_time );
3123
3123
time = ksmbd_UnixTimeToNT (stat .atime );
@@ -3423,9 +3423,9 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3423
3423
ffdinfo -> EaSize =
3424
3424
smb2_get_reparse_tag_special_file (ksmbd_kstat -> kstat -> mode );
3425
3425
if (ffdinfo -> EaSize )
3426
- ffdinfo -> ExtFileAttributes = ATTR_REPARSE_POINT_LE ;
3426
+ ffdinfo -> ExtFileAttributes = FILE_ATTRIBUTE_REPARSE_POINT_LE ;
3427
3427
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3428
- ffdinfo -> ExtFileAttributes |= ATTR_HIDDEN_LE ;
3428
+ ffdinfo -> ExtFileAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3429
3429
memcpy (ffdinfo -> FileName , conv_name , conv_len );
3430
3430
ffdinfo -> NextEntryOffset = cpu_to_le32 (next_entry_offset );
3431
3431
break ;
@@ -3439,11 +3439,11 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3439
3439
fbdinfo -> EaSize =
3440
3440
smb2_get_reparse_tag_special_file (ksmbd_kstat -> kstat -> mode );
3441
3441
if (fbdinfo -> EaSize )
3442
- fbdinfo -> ExtFileAttributes = ATTR_REPARSE_POINT_LE ;
3442
+ fbdinfo -> ExtFileAttributes = FILE_ATTRIBUTE_REPARSE_POINT_LE ;
3443
3443
fbdinfo -> ShortNameLength = 0 ;
3444
3444
fbdinfo -> Reserved = 0 ;
3445
3445
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3446
- fbdinfo -> ExtFileAttributes |= ATTR_HIDDEN_LE ;
3446
+ fbdinfo -> ExtFileAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3447
3447
memcpy (fbdinfo -> FileName , conv_name , conv_len );
3448
3448
fbdinfo -> NextEntryOffset = cpu_to_le32 (next_entry_offset );
3449
3449
break ;
@@ -3455,7 +3455,7 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3455
3455
fdinfo = (struct file_directory_info * )kstat ;
3456
3456
fdinfo -> FileNameLength = cpu_to_le32 (conv_len );
3457
3457
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3458
- fdinfo -> ExtFileAttributes |= ATTR_HIDDEN_LE ;
3458
+ fdinfo -> ExtFileAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3459
3459
memcpy (fdinfo -> FileName , conv_name , conv_len );
3460
3460
fdinfo -> NextEntryOffset = cpu_to_le32 (next_entry_offset );
3461
3461
break ;
@@ -3479,11 +3479,11 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3479
3479
dinfo -> EaSize =
3480
3480
smb2_get_reparse_tag_special_file (ksmbd_kstat -> kstat -> mode );
3481
3481
if (dinfo -> EaSize )
3482
- dinfo -> ExtFileAttributes = ATTR_REPARSE_POINT_LE ;
3482
+ dinfo -> ExtFileAttributes = FILE_ATTRIBUTE_REPARSE_POINT_LE ;
3483
3483
dinfo -> Reserved = 0 ;
3484
3484
dinfo -> UniqueId = cpu_to_le64 (ksmbd_kstat -> kstat -> ino );
3485
3485
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3486
- dinfo -> ExtFileAttributes |= ATTR_HIDDEN_LE ;
3486
+ dinfo -> ExtFileAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3487
3487
memcpy (dinfo -> FileName , conv_name , conv_len );
3488
3488
dinfo -> NextEntryOffset = cpu_to_le32 (next_entry_offset );
3489
3489
break ;
@@ -3497,13 +3497,13 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3497
3497
fibdinfo -> EaSize =
3498
3498
smb2_get_reparse_tag_special_file (ksmbd_kstat -> kstat -> mode );
3499
3499
if (fibdinfo -> EaSize )
3500
- fibdinfo -> ExtFileAttributes = ATTR_REPARSE_POINT_LE ;
3500
+ fibdinfo -> ExtFileAttributes = FILE_ATTRIBUTE_REPARSE_POINT_LE ;
3501
3501
fibdinfo -> UniqueId = cpu_to_le64 (ksmbd_kstat -> kstat -> ino );
3502
3502
fibdinfo -> ShortNameLength = 0 ;
3503
3503
fibdinfo -> Reserved = 0 ;
3504
3504
fibdinfo -> Reserved2 = cpu_to_le16 (0 );
3505
3505
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3506
- fibdinfo -> ExtFileAttributes |= ATTR_HIDDEN_LE ;
3506
+ fibdinfo -> ExtFileAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3507
3507
memcpy (fibdinfo -> FileName , conv_name , conv_len );
3508
3508
fibdinfo -> NextEntryOffset = cpu_to_le32 (next_entry_offset );
3509
3509
break ;
@@ -3529,9 +3529,10 @@ static int smb2_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
3529
3529
posix_info -> Mode = cpu_to_le32 (ksmbd_kstat -> kstat -> mode );
3530
3530
posix_info -> Inode = cpu_to_le64 (ksmbd_kstat -> kstat -> ino );
3531
3531
posix_info -> DosAttributes =
3532
- S_ISDIR (ksmbd_kstat -> kstat -> mode ) ? ATTR_DIRECTORY_LE : ATTR_ARCHIVE_LE ;
3532
+ S_ISDIR (ksmbd_kstat -> kstat -> mode ) ?
3533
+ FILE_ATTRIBUTE_DIRECTORY_LE : FILE_ATTRIBUTE_ARCHIVE_LE ;
3533
3534
if (d_info -> hide_dot_file && d_info -> name [0 ] == '.' )
3534
- posix_info -> DosAttributes |= ATTR_HIDDEN_LE ;
3535
+ posix_info -> DosAttributes |= FILE_ATTRIBUTE_HIDDEN_LE ;
3535
3536
id_to_sid (from_kuid_munged (& init_user_ns , ksmbd_kstat -> kstat -> uid ),
3536
3537
SIDNFS_USER , (struct smb_sid * )& posix_info -> SidBuffer [0 ]);
3537
3538
id_to_sid (from_kgid_munged (& init_user_ns , ksmbd_kstat -> kstat -> gid ),
@@ -5577,14 +5578,14 @@ static int set_file_basic_info(struct ksmbd_file *fp,
5577
5578
5578
5579
if (file_info -> Attributes ) {
5579
5580
if (!S_ISDIR (inode -> i_mode ) &&
5580
- file_info -> Attributes & ATTR_DIRECTORY_LE ) {
5581
+ file_info -> Attributes & FILE_ATTRIBUTE_DIRECTORY_LE ) {
5581
5582
pr_err ("can't change a file to a directory\n" );
5582
5583
return - EINVAL ;
5583
5584
}
5584
5585
5585
- if (!(S_ISDIR (inode -> i_mode ) && file_info -> Attributes == ATTR_NORMAL_LE ))
5586
+ if (!(S_ISDIR (inode -> i_mode ) && file_info -> Attributes == FILE_ATTRIBUTE_NORMAL_LE ))
5586
5587
fp -> f_ci -> m_fattr = file_info -> Attributes |
5587
- (fp -> f_ci -> m_fattr & ATTR_DIRECTORY_LE );
5588
+ (fp -> f_ci -> m_fattr & FILE_ATTRIBUTE_DIRECTORY_LE );
5588
5589
}
5589
5590
5590
5591
if (test_share_config_flag (share , KSMBD_SHARE_FLAG_STORE_DOS_ATTRS ) &&
@@ -5805,9 +5806,7 @@ static int set_file_mode_info(struct ksmbd_file *fp,
5805
5806
5806
5807
mode = file_info -> Mode ;
5807
5808
5808
- if ((mode & ~FILE_MODE_INFO_MASK ) ||
5809
- (mode & FILE_SYNCHRONOUS_IO_ALERT_LE &&
5810
- mode & FILE_SYNCHRONOUS_IO_NONALERT_LE )) {
5809
+ if ((mode & ~FILE_MODE_INFO_MASK )) {
5811
5810
pr_err ("Mode is not valid : 0x%x\n" , le32_to_cpu (mode ));
5812
5811
return - EINVAL ;
5813
5812
}
@@ -7444,9 +7443,9 @@ static inline int fsctl_set_sparse(struct ksmbd_work *work, u64 id,
7444
7443
7445
7444
old_fattr = fp -> f_ci -> m_fattr ;
7446
7445
if (sparse -> SetSparse )
7447
- fp -> f_ci -> m_fattr |= ATTR_SPARSE_FILE_LE ;
7446
+ fp -> f_ci -> m_fattr |= FILE_ATTRIBUTE_SPARSE_FILE_LE ;
7448
7447
else
7449
- fp -> f_ci -> m_fattr &= ~ATTR_SPARSE_FILE_LE ;
7448
+ fp -> f_ci -> m_fattr &= ~FILE_ATTRIBUTE_SPARSE_FILE_LE ;
7450
7449
7451
7450
if (fp -> f_ci -> m_fattr != old_fattr &&
7452
7451
test_share_config_flag (work -> tcon -> share_conf ,
0 commit comments