[Ocfs2-tools-commits] jlbec commits r391 - in trunk/libocfs2: . include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-11-11 16:05:58 -0600 (Thu, 11 Nov 2004)
New Revision: 391

Modified:
   trunk/libocfs2/cached_inode.c
   trunk/libocfs2/extent_map.c
   trunk/libocfs2/include/ocfs2.h
Log:
remove drop_extent_map

Modified: trunk/libocfs2/cached_inode.c
===================================================================
--- trunk/libocfs2/cached_inode.c	2004-11-11 21:53:32 UTC (rev 390)
+++ trunk/libocfs2/cached_inode.c	2004-11-11 22:05:58 UTC (rev 391)
@@ -74,7 +74,7 @@
 		return OCFS2_ET_INVALID_ARGUMENT;
 	
 	if (cinode->ci_map)
-		ocfs2_drop_extent_map(fs, cinode);
+		ocfs2_extent_map_free(cinode);
 	
 	if (cinode->ci_chains)
 		ocfs2_bitmap_free(cinode->ci_chains);

Modified: trunk/libocfs2/extent_map.c
===================================================================
--- trunk/libocfs2/extent_map.c	2004-11-11 21:53:32 UTC (rev 390)
+++ trunk/libocfs2/extent_map.c	2004-11-11 22:05:58 UTC (rev 391)
@@ -574,23 +574,11 @@
 	return 0;
 
 cleanup:
-	ocfs2_drop_extent_map(fs, cinode);
+	ocfs2_extent_map_free(cinode);
 
 	return ret;
 }
 
-errcode_t ocfs2_drop_extent_map(ocfs2_filesys *fs,
-				ocfs2_cached_inode *cinode)
-{
-	if (!cinode || !cinode->ci_map)
-		return OCFS2_ET_INVALID_ARGUMENT;
-
-	ocfs2_extent_map_free(cinode);
-	cinode->ci_map = NULL;
-
-	return 0;
-}
-
 static void __ocfs2_extent_map_drop(ocfs2_cached_inode  *cinode,
 				    uint32_t new_clusters,
 				    struct rb_node **free_head,

Modified: trunk/libocfs2/include/ocfs2.h
===================================================================
--- trunk/libocfs2/include/ocfs2.h	2004-11-11 21:53:32 UTC (rev 390)
+++ trunk/libocfs2/include/ocfs2.h	2004-11-11 22:05:58 UTC (rev 391)
@@ -278,8 +278,6 @@
 				      int *ret_count);
 errcode_t ocfs2_load_extent_map(ocfs2_filesys *fs,
 				ocfs2_cached_inode *cinode);
-errcode_t ocfs2_drop_extent_map(ocfs2_filesys *fs,
-				ocfs2_cached_inode *cinode);
 
 errcode_t ocfs2_create_journal_superblock(ocfs2_filesys *fs,
 					  uint32_t size, int flags,