From 323e29e4251047d69a29b5cde4b8c12b55cab42f Mon Sep 17 00:00:00 2001 From: shaver Date: Thu, 11 Sep 2003 22:04:20 +0000 Subject: [PATCH] b=1792: Fix iopen_connect_dentry to properly rehash the __iopen__ dentry when coverting it into a real, "connected" dentry. --- lustre/kernel_patches/patches/iopen-2.4.18.patch | 4 ++-- lustre/kernel_patches/patches/iopen-2.4.20.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/kernel_patches/patches/iopen-2.4.18.patch b/lustre/kernel_patches/patches/iopen-2.4.18.patch index b983b33..7fc40f7 100644 --- a/lustre/kernel_patches/patches/iopen-2.4.18.patch +++ b/lustre/kernel_patches/patches/iopen-2.4.18.patch @@ -227,8 +227,7 @@ + + /* Move the goal to the de hash queue - like d_move() */ + goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED; -+ list_del(&goal->d_hash); -+ list_add(&goal->d_hash, &de->d_hash); ++ list_del_init(&goal->d_hash); + + list_del(&goal->d_child); + list_del(&de->d_child); @@ -242,6 +241,7 @@ + /* And add them back to the (new) parent lists */ + list_add(&goal->d_child, &goal->d_parent->d_subdirs); + list_add(&de->d_child, &de->d_parent->d_subdirs); ++ __d_rehash(goal, 0); + spin_unlock(&dcache_lock); + + return goal; diff --git a/lustre/kernel_patches/patches/iopen-2.4.20.patch b/lustre/kernel_patches/patches/iopen-2.4.20.patch index ec48814..dcf2fc0 100644 --- a/lustre/kernel_patches/patches/iopen-2.4.20.patch +++ b/lustre/kernel_patches/patches/iopen-2.4.20.patch @@ -227,8 +227,7 @@ + + /* Move the goal to the de hash queue - like d_move() */ + goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED; -+ list_del(&goal->d_hash); -+ list_add(&goal->d_hash, &de->d_hash); ++ list_del_init(&goal->d_hash); + + list_del(&goal->d_child); + list_del(&de->d_child); @@ -242,6 +241,7 @@ + /* And add them back to the (new) parent lists */ + list_add(&goal->d_child, &goal->d_parent->d_subdirs); + list_add(&de->d_child, &de->d_parent->d_subdirs); ++ __d_rehash(goal, 0); + spin_unlock(&dcache_lock); + + return goal; -- 1.8.3.1