smb/client: preserve errors from smb2_set_sparse()

smb2_set_sparse() converts every FSCTL_SET_SPARSE failure to false and
marks sparse support as broken for the share. Callers therefore report
EOPNOTSUPP even for errors such as ENOSPC or EACCES, and later sparse
operations remain disabled until the share is unmounted.

Return the SMB2 ioctl error directly. Set broken_sparse_sup only for
EOPNOTSUPP, which indicates that the server does not support the request.

Update smb3_punch_hole() to propagate the error returned by
smb2_set_sparse().

Fixes: 3d1a3745d8ca ("Add sparse file support to SMB2/SMB3 mounts")
Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Reviewed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index c862a98e52df6ed2437ad1e97e38584cb4adde16..06e9322a762ae43aa856805059674120500a73a3 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -2117,8 +2117,9 @@ smb2_sync_write(const unsigned int xid, struct cifs_fid *pfid,
 }
 
 /* Set or clear the SPARSE_FILE attribute based on value passed in setsparse */
-static bool smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon,
-               struct cifsFileInfo *cfile, struct inode *inode, __u8 setsparse)
+static int smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon,
+                          struct cifsFileInfo *cfile, struct inode *inode,
+                          __u8 setsparse)
 {
        struct cifsInodeInfo *cifsi;
        int rc;
@@ -2127,31 +2128,31 @@ static bool smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon,
 
        /* if file already sparse don't bother setting sparse again */
        if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) && setsparse)
-               return true; /* already sparse */
+               return 0; /* already sparse */
 
        if (!(cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) && !setsparse)
-               return true; /* already not sparse */
+               return 0; /* already not sparse */
 
        /*
         * Can't check for sparse support on share the usual way via the
         * FS attribute info (FILE_SUPPORTS_SPARSE_FILES) on the share
         * since Samba server doesn't set the flag on the share, yet
         * supports the set sparse FSCTL and returns sparse correctly
-        * in the file attributes. If we fail setting sparse though we
-        * mark that server does not support sparse files for this share
-        * to avoid repeatedly sending the unsupported fsctl to server
-        * if the file is repeatedly extended.
+        * in the file attributes. If the server returns EOPNOTSUPP, mark
+        * that sparse files are not supported on this share to avoid
+        * repeatedly sending the unsupported FSCTL.
         */
        if (tcon->broken_sparse_sup)
-               return false;
+               return -EOPNOTSUPP;
 
        rc = SMB2_ioctl(xid, tcon, cfile->fid.persistent_fid,
                        cfile->fid.volatile_fid, FSCTL_SET_SPARSE,
                        &setsparse, 1, CIFSMaxBufSize, NULL, NULL);
        if (rc) {
-               tcon->broken_sparse_sup = true;
+               if (rc == -EOPNOTSUPP)
+                       tcon->broken_sparse_sup = true;
                cifs_dbg(FYI, "set sparse rc = %d\n", rc);
-               return false;
+               return rc;
        }
 
        if (setsparse)
@@ -2159,7 +2160,7 @@ static bool smb2_set_sparse(const unsigned int xid, struct cifs_tcon *tcon,
        else
                cifsi->cifsAttrs &= (~FILE_ATTRIBUTE_SPARSE_FILE);
 
-       return true;
+       return 0;
 }
 
 static int
@@ -3483,10 +3484,9 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
 
        /* Need to make file sparse, if not already, before freeing range. */
        /* Consider adding equivalent for compressed since it could also work */
-       if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) {
-               rc = -EOPNOTSUPP;
+       rc = smb2_set_sparse(xid, tcon, cfile, inode, set_sparse);
+       if (rc)
                goto out;
-       }
 
        filemap_invalidate_lock(inode->i_mapping);
        /*