On Wed, 20 Jun 2012 18:30:42 +0400 Pavel Shilovsky <pshilovsky@xxxxxxxxx> wrote: > and consider such codes as CIFS errors. > > Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx> > --- > fs/cifs/nterr.c | 6 +++--- > fs/cifs/nterr.h | 26 ++++++++++++++------------ > 2 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/fs/cifs/nterr.c b/fs/cifs/nterr.c > index 819fd99..908a3c7 100644 > --- a/fs/cifs/nterr.c > +++ b/fs/cifs/nterr.c > @@ -31,7 +31,7 @@ const struct nt_err_code_struct nt_errs[] = { > {"NT_STATUS_INVALID_INFO_CLASS", NT_STATUS_INVALID_INFO_CLASS}, > {"NT_STATUS_INFO_LENGTH_MISMATCH", NT_STATUS_INFO_LENGTH_MISMATCH}, > {"NT_STATUS_ACCESS_VIOLATION", NT_STATUS_ACCESS_VIOLATION}, > - {"STATUS_BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW}, > + {"STATUS_BUFFER_OVERFLOW", NT_STATUS_BUFFER_OVERFLOW}, Should you also change the text version of these names? Since we print those when debugging, then it might be nice to have them match the actual #define names. > {"NT_STATUS_IN_PAGE_ERROR", NT_STATUS_IN_PAGE_ERROR}, > {"NT_STATUS_PAGEFILE_QUOTA", NT_STATUS_PAGEFILE_QUOTA}, > {"NT_STATUS_INVALID_HANDLE", NT_STATUS_INVALID_HANDLE}, > @@ -681,7 +681,7 @@ const struct nt_err_code_struct nt_errs[] = { > NT_STATUS_QUOTA_LIST_INCONSISTENT}, > {"NT_STATUS_FILE_IS_OFFLINE", NT_STATUS_FILE_IS_OFFLINE}, > {"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES}, > - {"STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES}, > - {"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED}, > + {"STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES}, > + {"STATUS_SOME_UNMAPPED", NT_STATUS_SOME_UNMAPPED}, > {NULL, 0} > }; > diff --git a/fs/cifs/nterr.h b/fs/cifs/nterr.h > index 2572673..7a0eae5 100644 > --- a/fs/cifs/nterr.h > +++ b/fs/cifs/nterr.h > @@ -35,18 +35,20 @@ struct nt_err_code_struct { > extern const struct nt_err_code_struct nt_errs[]; > > /* Win32 Status codes. */ > -#define STATUS_MORE_ENTRIES 0x0105 > -#define ERROR_INVALID_PARAMETER 0x0057 > -#define ERROR_INSUFFICIENT_BUFFER 0x007a > -#define STATUS_1804 0x070c > -#define STATUS_NOTIFY_ENUM_DIR 0x010c > +#define NT_STATUS_MORE_ENTRIES 0x0105 > +#define NT_ERROR_INVALID_PARAMETER 0x0057 > +#define NT_ERROR_INSUFFICIENT_BUFFER 0x007a > +#define NT_STATUS_1804 0x070c > +#define NT_STATUS_NOTIFY_ENUM_DIR 0x010c > > -/* Win32 Error codes extracted using a loop in smbclient then printing a > - netmon sniff to a file. */ > +/* > + * Win32 Error codes extracted using a loop in smbclient then printing a netmon > + * sniff to a file. > + */ > > -#define NT_STATUS_OK 0x0000 > -#define STATUS_SOME_UNMAPPED 0x0107 > -#define STATUS_BUFFER_OVERFLOW 0x80000005 > +#define NT_STATUS_OK 0x0000 > +#define NT_STATUS_SOME_UNMAPPED 0x0107 > +#define NT_STATUS_BUFFER_OVERFLOW 0x80000005 > #define NT_STATUS_NO_MORE_ENTRIES 0x8000001a > #define NT_STATUS_MEDIA_CHANGED 0x8000001c > #define NT_STATUS_END_OF_MEDIA 0x8000001e -- Jeff Layton <jlayton@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html