diff options
Diffstat (limited to 'fs/cifs/netmisc.c')
-rw-r--r-- | fs/cifs/netmisc.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 646e1f06941b..7c51e2e9a9f7 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * fs/cifs/netmisc.c | 2 | * fs/cifs/netmisc.c |
3 | * | 3 | * |
4 | * Copyright (c) International Business Machines Corp., 2002 | 4 | * Copyright (c) International Business Machines Corp., 2002,2008 |
5 | * Author(s): Steve French (sfrench@us.ibm.com) | 5 | * Author(s): Steve French (sfrench@us.ibm.com) |
6 | * | 6 | * |
7 | * Error mapping routines from Samba libsmb/errormap.c | 7 | * Error mapping routines from Samba libsmb/errormap.c |
@@ -253,7 +253,8 @@ static const struct { | |||
253 | ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_MIX}, { | 253 | ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_MIX}, { |
254 | ERRHRD, ERRgeneral, NT_STATUS_INVALID_QUOTA_LOWER}, { | 254 | ERRHRD, ERRgeneral, NT_STATUS_INVALID_QUOTA_LOWER}, { |
255 | ERRHRD, ERRgeneral, NT_STATUS_DISK_CORRUPT_ERROR}, { | 255 | ERRHRD, ERRgeneral, NT_STATUS_DISK_CORRUPT_ERROR}, { |
256 | ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_INVALID}, { /* mapping changed since shell does lookup on * and expects file not found */ | 256 | /* mapping changed since shell does lookup on * expects FileNotFound */ |
257 | ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_INVALID}, { | ||
257 | ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_NOT_FOUND}, { | 258 | ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_NOT_FOUND}, { |
258 | ERRDOS, ERRalreadyexists, NT_STATUS_OBJECT_NAME_COLLISION}, { | 259 | ERRDOS, ERRalreadyexists, NT_STATUS_OBJECT_NAME_COLLISION}, { |
259 | ERRHRD, ERRgeneral, NT_STATUS_HANDLE_NOT_WAITABLE}, { | 260 | ERRHRD, ERRgeneral, NT_STATUS_HANDLE_NOT_WAITABLE}, { |
@@ -820,7 +821,8 @@ map_smb_to_linux_error(struct smb_hdr *smb, int logErr) | |||
820 | /* old style errors */ | 821 | /* old style errors */ |
821 | 822 | ||
822 | /* DOS class smb error codes - map DOS */ | 823 | /* DOS class smb error codes - map DOS */ |
823 | if (smberrclass == ERRDOS) { /* 1 byte field no need to byte reverse */ | 824 | if (smberrclass == ERRDOS) { |
825 | /* 1 byte field no need to byte reverse */ | ||
824 | for (i = 0; | 826 | for (i = 0; |
825 | i < | 827 | i < |
826 | sizeof(mapping_table_ERRDOS) / | 828 | sizeof(mapping_table_ERRDOS) / |
@@ -834,7 +836,8 @@ map_smb_to_linux_error(struct smb_hdr *smb, int logErr) | |||
834 | } | 836 | } |
835 | /* else try next error mapping one to see if match */ | 837 | /* else try next error mapping one to see if match */ |
836 | } | 838 | } |
837 | } else if (smberrclass == ERRSRV) { /* server class of error codes */ | 839 | } else if (smberrclass == ERRSRV) { |
840 | /* server class of error codes */ | ||
838 | for (i = 0; | 841 | for (i = 0; |
839 | i < | 842 | i < |
840 | sizeof(mapping_table_ERRSRV) / | 843 | sizeof(mapping_table_ERRSRV) / |
@@ -922,8 +925,8 @@ struct timespec cnvrtDosUnixTm(__u16 date, __u16 time) | |||
922 | { | 925 | { |
923 | struct timespec ts; | 926 | struct timespec ts; |
924 | int sec, min, days, month, year; | 927 | int sec, min, days, month, year; |
925 | SMB_TIME * st = (SMB_TIME *)&time; | 928 | SMB_TIME *st = (SMB_TIME *)&time; |
926 | SMB_DATE * sd = (SMB_DATE *)&date; | 929 | SMB_DATE *sd = (SMB_DATE *)&date; |
927 | 930 | ||
928 | cFYI(1, ("date %d time %d", date, time)); | 931 | cFYI(1, ("date %d time %d", date, time)); |
929 | 932 | ||