diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-02-25 13:15:53 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-02-25 13:15:53 +1100 |
| commit | d8b70278e20b276566a3893d288101ff4826df61 (patch) | |
| tree | 07ef73d8545fefcdcd9d8867763b1e4439b20aaa /source3/modules/onefs_streams.c | |
| parent | 7040d94149d8538c0b731b9e62b9b4c7807841b6 (diff) | |
| parent | ebe1aa9340d190b2ebcfd2c96f68c7771cccdf01 (diff) | |
| download | samba-d8b70278e20b276566a3893d288101ff4826df61.tar.gz samba-d8b70278e20b276566a3893d288101ff4826df61.tar.bz2 samba-d8b70278e20b276566a3893d288101ff4826df61.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/modules/onefs_streams.c')
| -rw-r--r-- | source3/modules/onefs_streams.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c index 9616ca48d5..2dcd8891eb 100644 --- a/source3/modules/onefs_streams.c +++ b/source3/modules/onefs_streams.c @@ -160,18 +160,26 @@ int onefs_rename(vfs_handle_struct *handle, const char *oldname, char *nbase = NULL; char *nsname = NULL; + START_PROFILE(syscall_rename_at); + frame = talloc_stackframe(); ret = onefs_is_stream(oldname, &obase, &osname, &old_is_stream); - if (ret) + if (ret) { + END_PROFILE(syscall_rename_at); return ret; + } ret = onefs_is_stream(newname, &nbase, &nsname, &new_is_stream); - if (ret) + if (ret) { + END_PROFILE(syscall_rename_at); return ret; + } if (!old_is_stream && !new_is_stream) { - return SMB_VFS_NEXT_RENAME(handle, oldname, newname); + ret = SMB_VFS_NEXT_RENAME(handle, oldname, newname); + END_PROFILE(syscall_rename_at); + return ret; } dir_fd = get_stream_dir_fd(handle->conn, obase, NULL); @@ -192,6 +200,8 @@ int onefs_rename(vfs_handle_struct *handle, const char *oldname, } done: + END_PROFILE(syscall_rename_at); + saved_errno = errno; if (dir_fd >= 0) { close(dir_fd); |