get rid of lustre_dump_dentry()

it's not only badly racy, it's actually dead code - the call in
ll_invalidate_aliases() is unreachable.  For an alias of our inode
to be root dentry, the inode would have to be its ->d_inode, aka
the root inode, and we never call ll_invalidate_aliases() for that.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c
index 5bb9c85cec8133691adb7371962b5a216698b0a9..88614b71cf6d2886950a890ca64e25778ecae602 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@ -263,14 +263,6 @@ void ll_invalidate_aliases(struct inode *inode)
                       dentry, dentry, dentry->d_parent,
                       dentry->d_inode, dentry->d_flags);
 
-               if (unlikely(dentry == dentry->d_sb->s_root)) {
-                       CERROR("%s: called on root dentry=%p, fid="DFID"\n",
-                              ll_get_fsname(dentry->d_sb, NULL, 0),
-                              dentry, PFID(ll_inode2fid(inode)));
-                       lustre_dump_dentry(dentry, 1);
-                       dump_stack();
-               }
-
                d_lustre_invalidate(dentry, 0);
        }
        ll_unlock_dcache(inode);

diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 37306e0c7aadd4e13f236a9f127aae4d5426c670..d032c2b086ccc535ccd488f1410a251b8811601d 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -816,7 +816,6 @@ int ll_show_options(struct seq_file *seq, struct dentry *dentry);
 void ll_dirty_page_discard_warn(struct page *page, int ioret);
 int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
                  struct super_block *, struct lookup_intent *);
-void lustre_dump_dentry(struct dentry *, int recur);
 int ll_obd_statfs(struct inode *inode, void *arg);
 int ll_get_max_mdsize(struct ll_sb_info *sbi, int *max_mdsize);
 int ll_get_default_mdsize(struct ll_sb_info *sbi, int *default_mdsize);

diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index a3367bfb1456a39c9c678bc7877e1e93f4531783..0af546a74154df26906e4f6be643096ab32054b2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -665,48 +665,6 @@ int ll_get_default_cookiesize(struct ll_sb_info *sbi, int *lmmsize)
        return rc;
 }
 
-static void ll_dump_inode(struct inode *inode)
-{
-       struct ll_d_hlist_node *tmp;
-       int dentry_count = 0;
-
-       LASSERT(inode != NULL);
-
-       ll_d_hlist_for_each(tmp, &inode->i_dentry)
-               dentry_count++;
-
-       CERROR("inode %p dump: dev=%s ino=%lu mode=%o count=%u, %d dentries\n",
-              inode, ll_i2mdexp(inode)->exp_obd->obd_name, inode->i_ino,
-              inode->i_mode, atomic_read(&inode->i_count), dentry_count);
-}
-
-void lustre_dump_dentry(struct dentry *dentry, int recur)
-{
-       struct list_head *tmp;
-       int subdirs = 0;
-
-       LASSERT(dentry != NULL);
-
-       list_for_each(tmp, &dentry->d_subdirs)
-               subdirs++;
-
-       CERROR("dentry %p dump: name=%pd parent=%pd (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
-              dentry, dentry, dentry->d_parent, dentry->d_parent,
-              dentry->d_inode, d_count(dentry),
-              dentry->d_flags, dentry->d_fsdata, subdirs);
-       if (dentry->d_inode != NULL)
-               ll_dump_inode(dentry->d_inode);
-
-       if (recur == 0)
-               return;
-
-       list_for_each(tmp, &dentry->d_subdirs) {
-               struct dentry *d = list_entry(tmp, struct dentry, d_child);
-
-               lustre_dump_dentry(d, recur - 1);
-       }
-}
-
 static void client_common_put_super(struct super_block *sb)
 {
        struct ll_sb_info *sbi = ll_s2sbi(sb);