samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r13623 - in branches/SAMBA_4_0/source/ntvfs: .

Subject: svn commit: samba r13623 - in branches/SAMBA_4_0/source/ntvfs: .
From:
Date: Wed, 22 Feb 2006 11:11:16 +0000 GMT
Author: metze
Date: 2006-02-22 11:11:16 +0000 (Wed, 22 Feb 2006)
New Revision: 13623

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13623

Log:
- make sure ntvfs_map_qfileinfo isn't used for async replies
- add some comments

metze

Modified:
   branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c     2006-02-22 10:28:02 UTC 
(rev 13622)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c     2006-02-22 11:11:16 UTC 
(rev 13623)
@@ -495,8 +495,7 @@
                return NT_STATUS_INVALID_LEVEL;
        }
        
-       /* this map function is only used by the simple backend, which
-          doesn't do async */
+       /* only used by the simple backend, which doesn't do async */
        req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
 
        /* ask the backend for the generic info */
@@ -854,6 +853,9 @@
        info2->generic.level = RAW_FILEINFO_GENERIC;
        info2->generic.in.fnum = info->generic.in.fnum;
 
+       /* only used by the simple backend, which doesn't do async */
+       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
        status = ntvfs->ops->qfileinfo(ntvfs, req, info2);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -937,6 +939,11 @@
        locks->offset = lck->lock.in.offset;
        locks->count = lck->lock.in.count;
 
+       /* 
+        * we don't need to call ntvfs_map_async_setup() here,
+        * as lock() doesn't have any output fields
+        */
+
        return ntvfs->ops->lock(ntvfs, req, lck2);
 }
 
@@ -1222,5 +1229,10 @@
                break;
        }
 
+       /* 
+        * we don't need to call ntvfs_map_async_setup() here,
+        * as close() doesn't have any output fields
+        */
+
        return ntvfs->ops->close(ntvfs, req, cl2);
 }

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r13623 - in branches/SAMBA_4_0/source/ntvfs: ., metze <=