Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / fs / ksmbd / smb2pdu.c

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 19412ac701a65cbfcf25a9a0f1a1b8a234c54cb7..bfa6b41d895b106f8507ab15596dc4a2892bb0d0 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -3776,7 +3776,7 @@ static int reserve_populate_dentry(struct ksmbd_dir_info *d_info,
        return 0;
 }
 
-static int __query_dir(struct dir_context *ctx, const char *name, int namlen,
+static bool __query_dir(struct dir_context *ctx, const char *name, int namlen,
                       loff_t offset, u64 ino, unsigned int d_type)
 {
        struct ksmbd_readdir_data       *buf;
@@ -3790,22 +3790,20 @@ static int __query_dir(struct dir_context *ctx, const char *name, int namlen,
 
        /* dot and dotdot entries are already reserved */
        if (!strcmp(".", name) || !strcmp("..", name))
-               return 0;
+               return true;
        if (ksmbd_share_veto_filename(priv->work->tcon->share_conf, name))
-               return 0;
+               return true;
        if (!match_pattern(name, namlen, priv->search_pattern))
-               return 0;
+               return true;
 
        d_info->name            = name;
        d_info->name_len        = namlen;
        rc = reserve_populate_dentry(d_info, priv->info_level);
        if (rc)
-               return rc;
-       if (d_info->flags & SMB2_RETURN_SINGLE_ENTRY) {
+               return false;
+       if (d_info->flags & SMB2_RETURN_SINGLE_ENTRY)
                d_info->out_buf_len = 0;
-               return 0;
-       }
-       return 0;
+       return true;
 }
 
 static void restart_ctx(struct dir_context *ctx)