vfs: make dirfsp arg to SMB_VFS_READLINKAT() const

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 90ee82ab258fa56cd7ba11b6f2123da16006bd79..2a3a7301bdb7b3b80c42ce08d8ade1783ea929df 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -474,7 +474,7 @@ static int skel_symlinkat(vfs_handle_struct *handle,
 }
 
 static int skel_vfs_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index d48ac47443b95fe880f2f0d160b3cb4870c1a3ab..a86b3e7cd19583ee5195d3d658b6429d78cf1566 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -600,7 +600,7 @@ static int skel_symlinkat(vfs_handle_struct *handle,
 }
 
 static int skel_vfs_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index b282e2a361bbde3dd29edcd88661edf942c9d4c7..22c139607e2c9659e33a53279b812d5e59586208 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -330,6 +330,7 @@
  * Change to Version 44 - will ship with 4.14.
  * Version 44 - Remove dirfsp arg from struct files_struct
  * Version 44 - Remove dirfsp arg to SMB_VFS_CREATE_FILE()
+ * Version 44 - Make dirfsp arg to SMB_VFS_READLINKAT() const
  */
 
 #define SMB_VFS_INTERFACE_VERSION 44
@@ -863,7 +864,7 @@ struct vfs_fn_pointers {
                                struct files_struct *dirfsp,
                                const struct smb_filename *new_smb_fname);
        int (*readlinkat_fn)(struct vfs_handle_struct *handle,
-                               struct files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz);
@@ -1407,7 +1408,7 @@ int smb_vfs_call_symlinkat(struct vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *new_smb_fname);
 int smb_vfs_call_readlinkat(struct vfs_handle_struct *handle,
-                       struct files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz);
@@ -1853,7 +1854,7 @@ int vfs_not_implemented_symlinkat(vfs_handle_struct *handle,
                                struct files_struct *dirfsp,
                                const struct smb_filename *new_smb_fname);
 int vfs_not_implemented_vfs_readlinkat(vfs_handle_struct *handle,
-                       struct files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz);

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 93f0454c608a89d4193674416215027b88c821b6..5deb7754f02eaa5c6334c2cb1150804fccbc93da 100644 (file)
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -519,7 +519,7 @@ static int cap_symlinkat(vfs_handle_struct *handle,
 }
 
 static int cap_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index a87d162e5736f4e04aa2e8b3239c22626a35959f..546502eb88fa6469d6b6ae4675165438e45b1909 100644 (file)
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1051,7 +1051,7 @@ static int cephwrap_symlinkat(struct vfs_handle_struct *handle,
 }
 
 static int cephwrap_readlinkat(struct vfs_handle_struct *handle,
-               files_struct *dirfsp,
+               const struct files_struct *dirfsp,
                const struct smb_filename *smb_fname,
                char *buf,
                size_t bufsiz)

diff --git a/source3/modules/vfs_ceph_snapshots.c b/source3/modules/vfs_ceph_snapshots.c
index 9ff5b9de074fe02fc17845df4b5560b5affcf1f5..80dfb48c2013d6a1739c80fc150e05cdcaf28680 100644 (file)
--- a/source3/modules/vfs_ceph_snapshots.c
+++ b/source3/modules/vfs_ceph_snapshots.c
@@ -1023,7 +1023,7 @@ static int ceph_snap_gmt_ntimes(vfs_handle_struct *handle,
 }
 
 static int ceph_snap_gmt_readlinkat(vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *csmb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 49e92ffea5510d631b315d7280fb20e2b092003d..904ee942c2aa3a9da12dc4c960a095c76a5aa3c8 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2883,7 +2883,7 @@ static int vfswrap_symlinkat(vfs_handle_struct *handle,
 }
 
 static int vfswrap_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 6845b81b0cb08dda9fa06618266e4a60e9a25932..7deeb2b737436151ebefe79dc8345b6b6b23ec6d 100644 (file)
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -183,7 +183,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
 }
 
 static int expand_msdfs_readlinkat(struct vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 5fceac6cf1fd59904d27bbe08d3e54342a1d3d90..f1823e3b22e3a4575c7e426a2bd7cf484e21bc50 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1813,7 +1813,7 @@ static int smb_full_audit_symlinkat(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index bf7244ea3a5c16aa37eab21f216da02fe52a8874..ca8b54829cd31c28e260acb0bc1878a21fe37524 100644 (file)
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1703,7 +1703,7 @@ static int vfs_gluster_symlinkat(struct vfs_handle_struct *handle,
 }
 
 static int vfs_gluster_readlinkat(struct vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index e3ce2804b5f41bc767f694e0740a6af254e4fb40..12e7ad61806be7aab5242d7e5bf05d04c2272995 100644 (file)
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -1643,7 +1643,7 @@ out:
  * Failure: set errno, return -1
  */
 static int mh_readlinkat(vfs_handle_struct *handle,
-               files_struct *dirfsp,
+               const struct files_struct *dirfsp,
                const struct smb_filename *smb_fname,
                char *buf,
                size_t bufsiz)

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index 9b5b0f6b4f65f27f237d6eadac097095b829de81..59aaddb163ad2651158938b4beb61efb4fb1aec4 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -472,7 +472,7 @@ int vfs_not_implemented_symlinkat(vfs_handle_struct *handle,
 }
 
 int vfs_not_implemented_vfs_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 0780895b0dd5359d7499cd707afc579feeb9ffff..e5413b75128bb0e6cc17c3b54053e617859a38eb 100644 (file)
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1568,7 +1568,7 @@ static int shadow_copy2_ntimes(vfs_handle_struct *handle,
 }
 
 static int shadow_copy2_readlinkat(vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index 8f239c6cb3fa1781453f40906e6767d664b6c937..3663bf2d4a357512fb9d390e6096290424c0e6c9 100644 (file)
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -2237,7 +2237,7 @@ static int snapper_gmt_ntimes(vfs_handle_struct *handle,
 }
 
 static int snapper_gmt_readlinkat(vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index c6b0130bb93889fab5fa7ec97b7018690da20454..7ff0b24ccedb2bd7569f9f06c055a7c8ed18bf29 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -1433,7 +1433,7 @@ static int smb_time_audit_symlinkat(vfs_handle_struct *handle,
 }
 
 static int smb_time_audit_readlinkat(vfs_handle_struct *handle,
-                               files_struct *dirfsp,
+                               const struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                char *buf,
                                size_t bufsiz)

diff --git a/source3/modules/vfs_unityed_media.c b/source3/modules/vfs_unityed_media.c
index ca20dc6baeb6f2bd5d5e0793aca0b8bec68aaee4..014420fd96197ef29c212d288feb23b0969f3dde 100644 (file)
--- a/source3/modules/vfs_unityed_media.c
+++ b/source3/modules/vfs_unityed_media.c
@@ -1284,7 +1284,7 @@ err:
 }
 
 static int um_readlinkat(vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 515b8c079b483b6f655d4975be1d2cf2a23998b5..1c8368b060c7e45af0999e918b16f905d6355f4e 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -2290,7 +2290,7 @@ int smb_vfs_call_symlinkat(struct vfs_handle_struct *handle,
 }
 
 int smb_vfs_call_readlinkat(struct vfs_handle_struct *handle,
-                       files_struct *dirfsp,
+                       const struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        char *buf,
                        size_t bufsiz)