[SCM] Samba Shared Repository - branch master updated

[David Mulder]

The branch, master has been updated
       via  321703fbea5 s3: vxfs: Remove unused vxfs_setxattr_path().
       via  9bb890a2af1 s3: vxfs: Remove unused vxfs_listxattr_path().
      from  d6a16ad00e4 s3:modules:vfs_virusfilter: Recent New_VFS changes break vfs_virusfilter_openat.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 321703fbea5dbf5238b3675ca678c0ddf979da02
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 19 13:59:58 2021 -0700

    s3: vxfs: Remove unused vxfs_setxattr_path().
    
    Missed when SMB_VFS_SETXATTR() was removed.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Mulder <dmulder at samba.org>
    
    Autobuild-User(master): David Mulder <dmulder at samba.org>
    Autobuild-Date(master): Mon Mar 22 22:36:05 UTC 2021 on sn-devel-184

commit 9bb890a2af1fc72efa16fa6e4c1f123cee2f87bd
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 19 13:55:26 2021 -0700

    s3: vxfs: Remove unused vxfs_listxattr_path().
    
    Missed when SMB_VFS_LISTXATTR() was removed.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Mulder <dmulder at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/lib_vxfs.c | 41 -----------------------------------------
 source3/modules/vfs_vxfs.h |  3 ---
 2 files changed, 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/lib_vxfs.c b/source3/modules/lib_vxfs.c
index dcb5cb304e1..13b2e612a27 100644
--- a/source3/modules/lib_vxfs.c
+++ b/source3/modules/lib_vxfs.c
@@ -61,30 +61,6 @@ int vxfs_setxattr_fd(int fd, const char *name, const void *value,
 	return ret;
 }
 
-int vxfs_setxattr_path(const char *path, const char *name, const void *value,
-		       size_t len, int flags, bool is_dir)
-{
-	int ret, fd = -1;
-
-	if (is_dir) {
-		fd = open(path, O_RDONLY|O_DIRECTORY);
-	} else {
-		fd = open(path, O_WRONLY);
-	}
-
-	if (fd == -1) {
-		DEBUG(10, ("error in vxfs_setxattr_path: %s\n",
-		      strerror(errno)));
-		return -1;
-	}
-
-	ret = vxfs_setxattr_fd(fd, name, value, len, flags);
-
-	close(fd);
-
-	return ret;
-}
-
 int vxfs_getxattr_fd(int fd, const char *name, void *value, size_t len)
 {
 	int ret;
@@ -189,23 +165,6 @@ int vxfs_listxattr_fd(int fd, char *list, size_t size)
 	return len;
 }
 
-int vxfs_listxattr_path(const char *path, char *list, size_t size)
-{
-	int ret, fd = -1;
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1) {
-		DEBUG(10, ("file not opened: vxfs_listxattr_path for %s\n",
-			   path));
-		return -1;
-	}
-
-	ret = vxfs_listxattr_fd(fd, list, size);
-	close(fd);
-
-	return ret;
-}
-
 int vxfs_setwxattr_fd(int fd)
 {
 	int ret = 0;
diff --git a/source3/modules/vfs_vxfs.h b/source3/modules/vfs_vxfs.h
index 19755900d73..e081baa0fc7 100644
--- a/source3/modules/vfs_vxfs.h
+++ b/source3/modules/vfs_vxfs.h
@@ -18,8 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-int vxfs_setxattr_path(const char *, const char *, const void *, size_t, int,
-		       bool);
 int vxfs_setxattr_fd(int, const char *, const void *, size_t, int);
 
 int vxfs_getxattr_path(const char *, const char *, void *, size_t);
@@ -28,7 +26,6 @@ int vxfs_getxattr_fd(int, const char *, void *, size_t);
 int vxfs_removexattr_path(const char *, const char *, bool);
 int vxfs_removexattr_fd(int, const char *);
 
-int vxfs_listxattr_path(const char *, char *, size_t);
 int vxfs_listxattr_fd(int, char *, size_t);
 
 int vxfs_setwxattr_path(const char *, bool);


-- 
Samba Shared Repository