From a7eef2da35648490ef2d168ec135add42ea0f6a5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 26 May 2008 19:16:19 -0700 Subject: [PATCH] mds: dont xlock dirlock on rename --- src/mds/Server.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index c9d96109ee587..71205eab3394b 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -3109,8 +3109,6 @@ void Server::handle_client_rename(MDRequest *mdr) rdlocks.insert(&srctrace[i]->lock); xlocks.insert(&srcdn->lock); wrlocks.insert(&srcdn->dir->inode->dirlock); - if (srcdn->is_primary() && srcdn->inode->is_dir()) - xlocks.insert(&srcdn->inode->dirlock); /* * no, this causes problems if the dftlock is scattered... @@ -3123,8 +3121,6 @@ void Server::handle_client_rename(MDRequest *mdr) rdlocks.insert(&desttrace[i]->lock); xlocks.insert(&destdn->lock); wrlocks.insert(&destdn->dir->inode->dirlock); - if (destdn->is_primary() && destdn->inode->is_dir()) - xlocks.insert(&destdn->inode->dirlock); // xlock versionlock on srci if remote? // this ensures it gets safely remotely auth_pinned, avoiding deadlock; -- 2.39.5