diff options
| author | Michael Adam <obnox@samba.org> | 2012-06-14 12:37:21 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-15 03:28:14 +0200 |
| commit | eae8740ebef61a1ecb42260fafc17f453aae2f3c (patch) | |
| tree | b23d5db8f09b3d5626d3795a42b2389b9086604a | |
| parent | 959c10e612894ff60ba6f32ff6d1c3488c520299 (diff) | |
| download | samba-eae8740ebef61a1ecb42260fafc17f453aae2f3c.tar.gz samba-eae8740ebef61a1ecb42260fafc17f453aae2f3c.tar.bz2 samba-eae8740ebef61a1ecb42260fafc17f453aae2f3c.zip | |
s3:vfs_default: use fsp_fnum_dbg() for fsp->fnum logging.
Note: it is actually wrong to access the fsp->fnum at all here,
since the fnum is part of the smb layer that should not be used
in the vfs layer. But this is subject be separated more cleanly
in later commits. This change only unifies the logging of fsp->fnum.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/modules/vfs_default.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index a39e10a129..b387cce109 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -819,7 +819,8 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, * I think I'll make this be the inode+dev. JRA. */ - DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on FID[0x%04X]\n",fsp->fnum)); + DEBUG(10,("FSCTL_CREATE_OR_GET_OBJECT_ID: called on %s\n", + fsp_fnum_dbg(fsp))); *out_len = (max_out_len >= 64) ? 64 : max_out_len; /* Hmmm, will this cause problems if less data asked for? */ @@ -839,14 +840,16 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, case FSCTL_GET_REPARSE_POINT: { /* Fail it with STATUS_NOT_A_REPARSE_POINT */ - DEBUG(10, ("FSCTL_GET_REPARSE_POINT: called on FID[0x%04X] Status: NOT_IMPLEMENTED\n", fsp->fnum)); + DEBUG(10, ("FSCTL_GET_REPARSE_POINT: called on %s. " + "Status: NOT_IMPLEMENTED\n", fsp_fnum_dbg(fsp))); return NT_STATUS_NOT_A_REPARSE_POINT; } case FSCTL_SET_REPARSE_POINT: { /* Fail it with STATUS_NOT_A_REPARSE_POINT */ - DEBUG(10, ("FSCTL_SET_REPARSE_POINT: called on FID[0x%04X] Status: NOT_IMPLEMENTED\n", fsp->fnum)); + DEBUG(10, ("FSCTL_SET_REPARSE_POINT: called on %s. " + "Status: NOT_IMPLEMENTED\n", fsp_fnum_dbg(fsp))); return NT_STATUS_NOT_A_REPARSE_POINT; } @@ -967,7 +970,8 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, uid_t uid; size_t sid_len; - DEBUG(10,("FSCTL_FIND_FILES_BY_SID: called on FID[0x%04X]\n", fsp->fnum)); + DEBUG(10, ("FSCTL_FIND_FILES_BY_SID: called on %s\n", + fsp_fnum_dbg(fsp))); if (in_len < 8) { /* NT_STATUS_BUFFER_TOO_SMALL maybe? */ @@ -1079,8 +1083,8 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, case FSCTL_IS_VOLUME_DIRTY: { - DEBUG(10,("FSCTL_IS_VOLUME_DIRTY: called on FID[0x%04X] " - "(but not implemented)\n", fsp->fnum)); + DEBUG(10,("FSCTL_IS_VOLUME_DIRTY: called on %s " + "(but not implemented)\n", fsp_fnum_dbg(fsp))); /* * http://msdn.microsoft.com/en-us/library/cc232128%28PROT.10%29.aspx * says we have to respond with NT_STATUS_INVALID_PARAMETER |