diff options
| author | Jeremy Allison <jra@samba.org> | 2009-02-24 17:33:47 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-02-24 17:33:47 -0800 |
| commit | f68c09110776c1cdeb83d16a660081e6be0c89ed (patch) | |
| tree | d3d2088ead8db0fb101c5185ca7f7bb462f075b8 /source3/modules/onefs_streams.c | |
| parent | cde5724780c0e52705e0f6e7cd41e0c884afbb40 (diff) | |
| parent | aeab22b55cb1484ff6da7242bd525e30b69e5752 (diff) | |
| download | samba-f68c09110776c1cdeb83d16a660081e6be0c89ed.tar.gz samba-f68c09110776c1cdeb83d16a660081e6be0c89ed.tar.bz2 samba-f68c09110776c1cdeb83d16a660081e6be0c89ed.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
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); |