From f857740a4da03e985946054f330d598d542f046d Mon Sep 17 00:00:00 2001
From: jpandre <jpandre>
Date: Fri, 19 Sep 2008 13:27:55 +0000
Subject: [PATCH] Renamed inode_cache to xinode_cache for easier reference

---
 include/ntfs-3g/volume.h | 2 +-
 libntfs-3g/dir.c         | 8 ++++----
 libntfs-3g/misc.c        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/ntfs-3g/volume.h b/include/ntfs-3g/volume.h
index bb2bc40c..30d062c0 100644
--- a/include/ntfs-3g/volume.h
+++ b/include/ntfs-3g/volume.h
@@ -230,7 +230,7 @@ struct _ntfs_volume {
 	s64 free_mft_records; 	/* Same for free mft records (see above) */
 
 #if CACHE_INODE_SIZE
-	struct CACHE_HEADER *inode_cache;
+	struct CACHE_HEADER *xinode_cache;
 #endif
 #if CACHE_SECURID_SIZE
 	struct CACHE_HEADER *securid_cache;
diff --git a/libntfs-3g/dir.c b/libntfs-3g/dir.c
index ce097b6e..b1d30ecd 100644
--- a/libntfs-3g/dir.c
+++ b/libntfs-3g/dir.c
@@ -502,7 +502,7 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent,
 			item.pathname = fullname;
 			item.varsize = strlen(fullname) + 1;
 			cached = (struct CACHED_INODE*)ntfs_fetch_cache(
-				vol->inode_cache, GENERIC(&item),
+				vol->xinode_cache, GENERIC(&item),
 				inode_cache_compare);
 		} else
 			cached = (struct CACHED_INODE*)NULL;
@@ -559,7 +559,7 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent,
 			item.pathname = fullname;
 			item.varsize = strlen(fullname) + 1;
 			cached = (struct CACHED_INODE*)ntfs_fetch_cache(
-					vol->inode_cache, GENERIC(&item),
+					vol->xinode_cache, GENERIC(&item),
 					inode_cache_compare);
 			if (cached) {
 				inum = cached->inum;
@@ -567,7 +567,7 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent,
 				inum = ntfs_inode_lookup_by_name(ni, unicode, len);
 				if (inum != (u64) -1) {
 					item.inum = inum;
-					ntfs_enter_cache(vol->inode_cache,
+					ntfs_enter_cache(vol->xinode_cache,
 							GENERIC(&item),
 							inode_cache_compare);
 				}
@@ -1662,7 +1662,7 @@ out:
 	if (p[0] && (p[strlen(p)-1] == PATH_SEP))
 		ntfs_log_error("Unnormalized path %s\n",pathname);
 	item.pathname = p;
-	count = ntfs_invalidate_cache(vol->inode_cache, GENERIC(&item),
+	count = ntfs_invalidate_cache(vol->xinode_cache, GENERIC(&item),
 				inode_cache_inv_compare);
 	if (!count)
 		ntfs_log_error("Could not delete inode cache entry for %s\n",
diff --git a/libntfs-3g/misc.c b/libntfs-3g/misc.c
index 5c3f2f56..8e662a6a 100644
--- a/libntfs-3g/misc.c
+++ b/libntfs-3g/misc.c
@@ -337,7 +337,7 @@ void ntfs_create_lru_caches(ntfs_volume *vol)
 {
 #if CACHE_INODE_SIZE
 		 /* inode cache */
-	vol->inode_cache = ntfs_create_cache("inode",
+	vol->xinode_cache = ntfs_create_cache("inode",
 		sizeof(struct CACHED_INODE), CACHE_INODE_SIZE);
 #endif
 	vol->securid_cache = ntfs_create_cache("securid",
@@ -355,7 +355,7 @@ void ntfs_create_lru_caches(ntfs_volume *vol)
 void ntfs_free_lru_caches(ntfs_volume *vol)
 {
 #if CACHE_INODE_SIZE
-	ntfs_free_cache(vol->inode_cache);
+	ntfs_free_cache(vol->xinode_cache);
 #endif
 	ntfs_free_cache(vol->securid_cache);
 #if CACHE_LEGACY_SIZE