From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Nov 2010 18:13:06 +0000 (-0700)
Subject: client: only do truncate on regular files
X-Git-Tag: v0.23~54^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20e8a4519d7cbfc1454fde7d40917d55e5cbcc6d;p=ceph.git

client: only do truncate on regular files

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index e103c59af21e..08850fc15296 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -372,10 +372,10 @@ void Client::update_inode_file_bits(Inode *in,
     }
   }
   if (truncate_seq >= in->truncate_seq &&
-      in->truncate_size != truncate_size) {
+      in->truncate_size != truncate_size &&
+      in->is_file()) {
     dout(10) << "truncate_size " << in->truncate_size << " -> "
 	     << truncate_size << dendl;
-    assert(in->is_file());
     in->truncate_size = truncate_size;
     in->oset.truncate_size = truncate_size;
     if (g_conf.client_oc && prior_size) { //do actual truncation