1 files changed, 5 insertions, 4 deletions

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index 581c225f7f50..d5ce9e26696c 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -110,7 +110,7 @@ static const struct smb_to_posix_error mapping_table_ERRSRV[] = {
         {ERRnoroom, -ENOSPC},
         {ERRrmuns, -EUSERS},
         {ERRtimeout, -ETIME},
-        {ERRnoresource, -ENOBUFS},
+        {ERRnoresource, -EREMOTEIO},
         {ERRtoomanyuids, -EUSERS},
         {ERRbaduid, -EACCES},
         {ERRusempx, -EIO},
@@ -412,7 +412,7 @@ static const struct {
          from NT_STATUS_INSUFFICIENT_RESOURCES to
          NT_STATUS_INSUFF_SERVER_RESOURCES during the session setup } */
         {
-        ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES}, {
+        ERRDOS, ERRnoresource, NT_STATUS_INSUFFICIENT_RESOURCES}, {
         ERRDOS, ERRbadpath, NT_STATUS_DFS_EXIT_PATH_FOUND}, {
         ERRDOS, 23, NT_STATUS_DEVICE_DATA_ERROR}, {
         ERRHRD, ERRgeneral, NT_STATUS_DEVICE_NOT_CONNECTED}, {
@@ -682,7 +682,7 @@ static const struct {
         ERRHRD, ERRgeneral, NT_STATUS_NO_USER_SESSION_KEY}, {
         ERRDOS, 59, NT_STATUS_USER_SESSION_DELETED}, {
         ERRHRD, ERRgeneral, NT_STATUS_RESOURCE_LANG_NOT_FOUND}, {
-        ERRDOS, ERRnomem, NT_STATUS_INSUFF_SERVER_RESOURCES}, {
+        ERRDOS, ERRnoresource, NT_STATUS_INSUFF_SERVER_RESOURCES}, {
         ERRHRD, ERRgeneral, NT_STATUS_INVALID_BUFFER_SIZE}, {
         ERRHRD, ERRgeneral, NT_STATUS_INVALID_ADDRESS_COMPONENT}, {
         ERRHRD, ERRgeneral, NT_STATUS_INVALID_ADDRESS_WILDCARD}, {
@@ -913,8 +913,9 @@ map_smb_to_linux_error(char *buf, bool logErr)
  * portion, the number of word parameters and the data portion of the message
  */
 unsigned int
-smbCalcSize(struct smb_hdr *ptr)
+smbCalcSize(void *buf)
 {
+        struct smb_hdr *ptr = (struct smb_hdr *)buf;
         return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +
                 2 /* size of the bcc field */ + get_bcc(ptr));
 }