Prefix VFS API macros with SMB_ for consistency and to avoid problems with VFS_ macro...

[amitay/samba.git] / source3 / locking / posix.c

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 1c794a1c86d6a7bdf1176d3cbb815430d527cfc2..6173c80b2fd96587ef9c893cf9826487cb5e24f9 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -205,7 +205,7 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
                /*
                 * No POSIX to worry about, just close.
                 */
-               ret = VFS_CLOSE(fsp,fsp->fd);
+               ret = SMB_VFS_CLOSE(fsp,fsp->fd);
                fsp->fd = -1;
                return ret;
        }
@@ -259,7 +259,7 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
                DEBUG(10,("fd_close_posix: doing close on %u fd's.\n", (unsigned int)count ));
 
                for(i = 0; i < count; i++) {
-                       if (VFS_CLOSE(fsp,fd_array[i]) == -1) {
+                       if (SMB_VFS_CLOSE(fsp,fd_array[i]) == -1) {
                                saved_errno = errno;
                        }
                }
@@ -278,7 +278,7 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
         * Finally close the fd associated with this fsp.
         */
 
-       ret = VFS_CLOSE(fsp,fsp->fd);
+       ret = SMB_VFS_CLOSE(fsp,fsp->fd);
 
        if (saved_errno != 0) {
         errno = saved_errno;
@@ -649,7 +649,7 @@ static BOOL posix_fcntl_lock(files_struct *fsp, int op, SMB_OFF_T offset, SMB_OF
 
        DEBUG(8,("posix_fcntl_lock %d %d %.0f %.0f %d\n",fsp->fd,op,(double)offset,(double)count,type));
 
-       ret = VFS_LOCK(fsp,fsp->fd,op,offset,count,type);
+       ret = SMB_VFS_LOCK(fsp,fsp->fd,op,offset,count,type);
 
        if (!ret && ((errno == EFBIG) || (errno == ENOLCK) || (errno ==  EINVAL))) {
 
@@ -673,7 +673,7 @@ static BOOL posix_fcntl_lock(files_struct *fsp, int op, SMB_OFF_T offset, SMB_OF
                        DEBUG(0,("Count greater than 31 bits - retrying with 31 bit truncated length.\n"));
                        errno = 0;
                        count &= 0x7fffffff;
-                       ret = VFS_LOCK(fsp,fsp->fd,op,offset,count,type);
+                       ret = SMB_VFS_LOCK(fsp,fsp->fd,op,offset,count,type);
                }
        }