diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 44b8a1419..e29aaa25a 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,17 @@
+2004-09-04  Pavel S. Shirshov  <pavelsh@mail.ru>
+
+	* vfs.c (vfs_cmp_handle): Fixing warnings on on 64-bit 
+	platforms.
+	(vfs_op):Likewise.
+	(vfs_info):Likewise.
+	(vfs_free_handle):Likewise.
+	* extfs/rpm (mcrpmfs_run): Quote parameters to calls 
+	to system/open that spawn a shell.
+	* direntry.c (vfs_s_find_entry_tree): Make "size" 
+	size_t.
+
+Based on patches from Jakub Jelinek  <jakub@redhat.com>
+
 2004-09-02  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
         * tar.c (tar_read_header): Fix missed *.
diff --git a/vfs/direntry.c b/vfs/direntry.c
index d10315c88..55b0d2c25 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -240,7 +240,7 @@ static struct vfs_s_entry *
 vfs_s_find_entry_tree (struct vfs_class *me, struct vfs_s_inode *root,
 		       char *path, int follow, int flags)
 {
-    unsigned int pseg;
+    size_t pseg;
     struct vfs_s_entry *ent = NULL;
 
     canonicalize_pathname (path);
diff --git a/vfs/extfs/rpm b/vfs/extfs/rpm
index a9d044ba4..0a299f9ae 100644
--- a/vfs/extfs/rpm
+++ b/vfs/extfs/rpm
@@ -177,8 +177,8 @@ mcrpmfs_run ()
 {
     f="`echo "$1" | $SED "$SEDCMD"`"
     case "$2" in
-	INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$1"; exit 0;;
-	UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$1"; exit 0;;
+	INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$f"; exit 0;;
+	UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$f"; exit 0;;
     esac
 }
 
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 7a8f115fd..c27673fb7 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -85,7 +85,7 @@ vfs_cmp_handle (gconstpointer a, gconstpointer b)
 {
     if (!a)
 	return 1;
-    return ((struct vfs_openfile *) a)->handle != (int) b;
+    return ((struct vfs_openfile *) a)->handle != (long) b;
 }
 
 /* Find VFS class by file handle */
@@ -95,7 +95,7 @@ vfs_op (int handle)
     GSList *l;
     struct vfs_openfile *h;
 
-    l = g_slist_find_custom (vfs_openfiles, (void *) handle,
+    l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
 			     vfs_cmp_handle);
     if (!l)
 	return NULL;
@@ -112,7 +112,7 @@ vfs_info (int handle)
     GSList *l;
     struct vfs_openfile *h;
 
-    l = g_slist_find_custom (vfs_openfiles, (void *) handle,
+    l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
 			     vfs_cmp_handle);
     if (!l)
 	return NULL;
@@ -128,7 +128,7 @@ vfs_free_handle (int handle)
 {
     GSList *l;
 
-    l = g_slist_find_custom (vfs_openfiles, (void *) handle,
+    l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
 			     vfs_cmp_handle);
     vfs_openfiles = g_slist_delete_link (vfs_openfiles, l);
 }