smbd: Introduce fsp_is_alternate_stream()

To me this is more descriptive than "fsp->base_fsp != NULL". If this
turns out to be a performance problem, I would go and make this a
static inline in smbd/proto.h.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(backported from commit 21b380ca133417df096e2b262a5da41faff186ea)
[slow@samba.org: only backport the function, skip all changed callers]

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 3f90c2e247ed16fb1ebaf2f08945099c881cf8ae..2930ceb18f6e76903c08d9725ee1445aacd016cf 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1487,3 +1487,8 @@ void fsp_set_base_fsp(struct files_struct *fsp, struct files_struct *base_fsp)
                fsp->base_fsp->stream_fsp = fsp;
        }
 }
+
+bool fsp_is_alternate_stream(const struct files_struct *fsp)
+{
+       return (fsp->base_fsp != NULL);
+}

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index d937d3d9615affc168eaf9199325febae7dea955..9539a3c2d4cd5dadcf8c748d5ddcb37edc38b2f7 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -438,6 +438,7 @@ NTSTATUS fsp_set_smb_fname(struct files_struct *fsp,
                           const struct smb_filename *smb_fname_in);
 size_t fsp_fullbasepath(struct files_struct *fsp, char *buf, size_t buflen);
 void fsp_set_base_fsp(struct files_struct *fsp, struct files_struct *base_fsp);
+bool fsp_is_alternate_stream(const struct files_struct *fsp);
 
 NTSTATUS create_internal_fsp(connection_struct *conn,
                             const struct smb_filename *smb_fname,