smb3: improve handling of share deleted (and share recreated)

When a share is deleted, returning EIO is confusing and no useful
information is logged.  Improve the handling of this case by
at least logging a better error for this (and also mapping the error
differently to EREMCHG).  See e.g. the new messages that would be logged:

[55243.639530] server share \\192.168.1.219\scratch deleted
[55243.642568] CIFS VFS: \\192.168.1.219\scratch BAD_NETWORK_NAME: \\192.168.1.219\scratch

In addition for the case where a share is deleted and then recreated
with the same name, have now fixed that so it works. This is sometimes
done for example, because the admin had to move a share to a different,
bigger local drive when a share is running low on space.

Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index c866555b627808ea6b7cbd166607b400f4ec427a..d2a3fb7e5c8dcc7260b7fa3672495f8ea9d5e70d 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -335,6 +335,12 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
                cifsFileInfo_put(cfile);
 
        SMB2_open_free(&rqst[0]);
+       if (rc == -EREMCHG) {
+               printk_once(KERN_WARNING "server share %s deleted\n",
+                           tcon->treeName);
+               tcon->need_reconnect = true;
+       }
+
        switch (command) {
        case SMB2_OP_QUERY_INFO:
                if (rc == 0) {

diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c
index 82ade16c9501a2ffc160655d2816ff95b2a7769d..7fde3775cb5748c5202c0b2f8359c853969bfd0d 100644 (file)
--- a/fs/cifs/smb2maperror.c
+++ b/fs/cifs/smb2maperror.c
@@ -511,7 +511,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
        {STATUS_PRINT_QUEUE_FULL, -EIO, "STATUS_PRINT_QUEUE_FULL"},
        {STATUS_NO_SPOOL_SPACE, -EIO, "STATUS_NO_SPOOL_SPACE"},
        {STATUS_PRINT_CANCELLED, -EIO, "STATUS_PRINT_CANCELLED"},
-       {STATUS_NETWORK_NAME_DELETED, -EIO, "STATUS_NETWORK_NAME_DELETED"},
+       {STATUS_NETWORK_NAME_DELETED, -EREMCHG, "STATUS_NETWORK_NAME_DELETED"},
        {STATUS_NETWORK_ACCESS_DENIED, -EACCES, "STATUS_NETWORK_ACCESS_DENIED"},
        {STATUS_BAD_DEVICE_TYPE, -EIO, "STATUS_BAD_DEVICE_TYPE"},
        {STATUS_BAD_NETWORK_NAME, -ENOENT, "STATUS_BAD_NETWORK_NAME"},

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 9b74149b471fed0cef567b3d4af35d34f2f9349a..3672ce0bfbaf103c0f02cf41189b48fb133df2ad 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -741,8 +741,14 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *pfid)
 
        /* Cached root is still invalid, continue normaly */
 
-       if (rc)
+       if (rc) {
+               if (rc == -EREMCHG) {
+                       tcon->need_reconnect = true;
+                       printk_once(KERN_WARNING "server share %s deleted\n",
+                                   tcon->treeName);
+               }
                goto oshr_exit;
+       }
 
        o_rsp = (struct smb2_create_rsp *)rsp_iov[0].iov_base;
        oparms.fid->persistent_fid = o_rsp->PersistentFileId;
@@ -2237,6 +2243,11 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
                                resp_buftype, rsp_iov);
        if (rc) {
                free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
+               if (rc == -EREMCHG) {
+                       tcon->need_reconnect = true;
+                       printk_once(KERN_WARNING "server share %s deleted\n",
+                                   tcon->treeName);
+               }
                goto qic_exit;
        }
        *rsp = rsp_iov[1];

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index cab696ac68aba827350175e87759a5f536870494..01d5c4af24586ccf5358f1ba84ee8f225f7dc4fb 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2595,6 +2595,11 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
                }
                trace_smb3_open_err(xid, tcon->tid, ses->Suid,
                                    oparms->create_options, oparms->desired_access, rc);
+               if (rc == -EREMCHG) {
+                       printk_once(KERN_WARNING "server share %s deleted\n",
+                                   tcon->treeName);
+                       tcon->need_reconnect = true;
+               }
                goto creat_exit;
        } else
                trace_smb3_open_done(xid, rsp->PersistentFileId, tcon->tid,