From 2ce81eca3df80222c25b1bdeb13313c91d411707 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Wed, 4 Aug 2004 16:30:50 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@68 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/include/types.h | 1 +
 ceph/mds/CDir.cc     | 4 ++--
 ceph/mds/CInode.cc   | 6 ++++--
 ceph/mds/MDCache.cc  | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ceph/include/types.h b/ceph/include/types.h
index 1121a4526c8..36243f68bcb 100644
--- a/ceph/include/types.h
+++ b/ceph/include/types.h
@@ -5,6 +5,7 @@
 #include <ext/hash_map>
 #include <string>
 #include <set>
+#include <iostream>
 using namespace std;
 
 
diff --git a/ceph/mds/CDir.cc b/ceph/mds/CDir.cc
index c4466f0fe0a..b180051adb1 100644
--- a/ceph/mds/CDir.cc
+++ b/ceph/mds/CDir.cc
@@ -73,7 +73,7 @@ CDentry* CDir::lookup(string& n) {
 int CDir::dentry_authority(string& dn, MDCluster *mdc)
 {
   if (inode->dir_auth == CDIR_AUTH_PARENT) {
-	cout << "dir_auth parent at " << *inode << endl;
+	dout(11) << "dir_auth parent at " << *inode << endl;
 	return inode->authority( mdc );       // same as my inode
   }
   if (inode->dir_auth == CDIR_AUTH_HASH) {
@@ -82,7 +82,7 @@ int CDir::dentry_authority(string& dn, MDCluster *mdc)
   }
 
   // it's explicit for this whole dir
-  cout << "dir_auth explicit " << inode->dir_auth << " at " << *inode << endl;
+  dout(11) << "dir_auth explicit " << inode->dir_auth << " at " << *inode << endl;
   return inode->dir_auth;
 }
 
diff --git a/ceph/mds/CInode.cc b/ceph/mds/CInode.cc
index c91a466a554..26861799404 100644
--- a/ceph/mds/CInode.cc
+++ b/ceph/mds/CInode.cc
@@ -10,6 +10,8 @@
 
 #include <string>
 
+#include "include/config.h"
+#define dout(x)  if (x <= DEBUG_LEVEL) cout << "cinode:"
 
 
 
@@ -224,13 +226,13 @@ int CInode::dir_authority(MDCluster *mdc)
 {
   // explicit
   if (dir_auth >= 0) {
-	cout << "dir_auth explicit " << dir_auth << " at " << *this << endl;
+	dout(11) << "dir_auth explicit " << dir_auth << " at " << *this << endl;
 	return dir_auth;
   }
 
   // parent
   if (dir_auth == CDIR_AUTH_PARENT) {
-	cout << "dir_auth parent at " << *this << endl;
+	dout(11) << "dir_auth parent at " << *this << endl;
 	return authority(mdc);
   }
 
diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index 47d649df69a..a683025e2ef 100644
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -2075,8 +2075,8 @@ void MDCache::import_dir_block(pchar& p,
 		mds->logger->inc("imex");
 	  }
 
-	} else
-	  in->dir_auth = CDIR_AUTH_PARENT;
+	}
+    //} else in->dir_auth = CDIR_AUTH_PARENT;
   }
  
 }