summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-09-09 08:03:53 +0200
committerStefan Metzmacher <metze@samba.org>2019-09-10 21:13:09 +0000
commitb4aaa612d33caf51b44830d75997d4ad93b7740d (patch)
tree6dbabb04485c06a2b05a73f169082df93bef7c7e
parentb14dd975c754be30d247591190bec5db3f305245 (diff)
downloadsamba-b4aaa612d33caf51b44830d75997d4ad93b7740d.tar.gz
s3:vfs: streamline vfs_stat_fsp()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14121 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit e00e78cfeda99bd5374eff8fb4ba84873e4e46b7)
-rw-r--r--source3/smbd/vfs.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 51a4aeb0f22..67f7d6356a2 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1413,13 +1413,11 @@ NTSTATUS vfs_stat_fsp(files_struct *fsp)
} else {
ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);
}
- if (ret == -1) {
- return map_nt_error_from_unix(errno);
- }
} else {
- if(SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st) != 0) {
- return map_nt_error_from_unix(errno);
- }
+ ret = SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st);
+ }
+ if (ret == -1) {
+ return map_nt_error_from_unix(errno);
}
return NT_STATUS_OK;
}