diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 1ab3e96fe..3b0ee44c8 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,10 @@
 2003-02-19  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
+	* smbfs.c (smbfs_lseek): Backport from Samba 2.2.7 Suite.
+	(fake_server_stat): Warning fix for AIX.  Reformat function.
+	(fake_share_stat): Likewise.
+	(smbfs_mkdir): Likewise.
+
 	* vfs.c (is_localized_month): New function for locale's
 	abbreviated month name as any 3 bytes long string without digits
 	and control characters.
diff --git a/vfs/smbfs.c b/vfs/smbfs.c
index 866b16085..8a265cc7e 100644
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@ -1201,34 +1201,34 @@ smbfs_opendir (vfs *me, char *dirname)
 }
 
 static int
-fake_server_stat(const char *server_url, const char *path, struct stat *buf)
+fake_server_stat (const char *server_url, const char *path, struct stat *buf)
 {
-	dir_entry *dentry;
-	char *p;
+    dir_entry *dentry;
+    char *p;
 
-	if ((p = strrchr(path, '/')))
-		path = p + 1;		/* advance until last '/' */
+    if ((p = strrchr (path, '/')))
+	path = p + 1;		/* advance until last '/' */
 
-	if (!current_info->entries) {
-		if (!smbfs_loaddir(current_info));	/* browse host */
-			return -1;
-	}
+    if (!current_info->entries) {
+	if (!smbfs_loaddir (current_info));	/* browse host */
+	return -1;
+    }
 
     if (current_info->server_list == True) {
 	dentry = current_info->entries;
-	DEBUG(4, ("fake stat for SERVER \"%s\"\n", path));
+	DEBUG (4, ("fake stat for SERVER \"%s\"\n", path));
 	while (dentry) {
-		if (strcmp(dentry->text, path) == 0) {
-			DEBUG(4, ("fake_server_stat: %s:%4o\n",
-				dentry->text, dentry->my_stat.st_mode));
-			memcpy(buf, &dentry->my_stat, sizeof(struct stat));
-			return 0;
-		}
-		dentry = dentry->next;
+	    if (strcmp (dentry->text, path) == 0) {
+		DEBUG (4, ("fake_server_stat: %s:%4o\n",
+			   dentry->text, (int)dentry->my_stat.st_mode));
+		memcpy (buf, &dentry->my_stat, sizeof (struct stat));
+		return 0;
+	    }
+	    dentry = dentry->next;
 	}
     }
-	my_errno = ENOENT;
-	return -1;
+    my_errno = ENOENT;
+    return -1;
 }
 
 static int
@@ -1270,7 +1270,7 @@ fake_share_stat (const char *server_url, const char *path, struct stat *buf)
     while (dentry) {
 	if (strcmp (dentry->text, path) == 0) {
 	    DEBUG (6, ("fake_share_stat: %s:%4o\n",
-		       dentry->text, dentry->my_stat.st_mode));
+		       dentry->text, (int) dentry->my_stat.st_mode));
 	    memcpy (buf, &dentry->my_stat, sizeof (struct stat));
 	    return 0;
 	}
@@ -1439,7 +1439,7 @@ smbfs_chdir (vfs *me, char *path)
     return 0;
 }
 
-static int 
+static int
 loaddir(vfs *me, const char *path)
 {
 	void *info;
@@ -1567,9 +1567,34 @@ smbfs_stat (vfs * me, char *path, struct stat *buf)
 static int
 smbfs_lseek (void *data, off_t offset, int whence)
 {
-	DEBUG(3, ("smbfs_lseek()\n"));
-	my_errno = EOPNOTSUPP;
-    return -1;
+    smbfs_handle *info = (smbfs_handle *) data;
+    size_t size;
+
+    DEBUG (3,
+	   ("smbfs_lseek(info->nread => %d, offset => %d, whence => %d) \n",
+	    (int) info->nread, (int) offset, whence));
+
+    switch (whence) {
+    case SEEK_SET:
+	info->nread = offset;
+	break;
+    case SEEK_CUR:
+	info->nread += offset;
+	break;
+    case SEEK_END:
+	if (!cli_qfileinfo (info->cli, info->fnum,
+			    NULL, &size, NULL, NULL, NULL,
+			    NULL, NULL) &&
+	    !cli_getattrE (info->cli, info->fnum,
+			   NULL, &size, NULL, NULL, NULL)) {
+	    errno = EINVAL;
+	    return -1;
+	}
+	info->nread = size + offset;
+	break;
+    }
+
+    return info->nread;
 }
 
 static int
@@ -1581,26 +1606,26 @@ smbfs_mknod (vfs *me, char *path, int mode, int dev)
 }
 
 static int
-smbfs_mkdir (vfs *me, char *path, mode_t mode)
+smbfs_mkdir (vfs * me, char *path, mode_t mode)
 {
-	smbfs_connection *sc;
-	char *remote_file;
+    smbfs_connection *sc;
+    char *remote_file;
 
-	DEBUG(3, ("smbfs_mkdir(path:%s, mode:%d)\n", path, mode));
-	if ((remote_file = smbfs_get_path (&sc, path)) == 0)
-		return -1;
-	g_free (remote_file);
-	convert_path(&path, FALSE);
+    DEBUG (3, ("smbfs_mkdir(path:%s, mode:%d)\n", path, (int) mode));
+    if ((remote_file = smbfs_get_path (&sc, path)) == 0)
+	return -1;
+    g_free (remote_file);
+    convert_path (&path, FALSE);
 
-	if (!cli_mkdir(sc->cli, path)) {
-		my_errno = cli_error(sc->cli, NULL, &err, NULL);
-		message_3s (1, MSG_ERROR, _(" Error %s creating directory %s "), 
-			cli_errstr(sc->cli), CNV_LANG(path));
-		g_free (path);
-		return -1;
-	} 
+    if (!cli_mkdir (sc->cli, path)) {
+	my_errno = cli_error (sc->cli, NULL, &err, NULL);
+	message_3s (1, MSG_ERROR, _(" Error %s creating directory %s "),
+		    cli_errstr (sc->cli), CNV_LANG (path));
 	g_free (path);
-	return 0;
+	return -1;
+    }
+    g_free (path);
+    return 0;
 }
 
 static int