[LU-5983] builds broken by LU-5275 fix

• Status: Resolved
• Project: Lustre
• Fix Version/s: Lustre 2.7.0
• Type: Bug
• Priority: Blocker
• Reporter: Bob Glossman (Inactive)
• Assignee: Bob Glossman (Inactive)
• Resolution: Fixed
• Severity: 3

Description

The recent commit 0ad4f8a4227ed7dd93fec99d33c6bb25056473fc for "LU-5275 lprocfs: remove last of non seq data structs and functions." breaks some lustre builds. In particular the problem comes from the renaming of the lustre internal routine lprocfs_try_remove_proc_entry() to remove_proc_subtree(). Newer linux kernels have their own exported remove_proc_subtree() API that conflicts. This is true in both the latest el6.6 kernel and the el7 kernel.

My first inclination was to add autoconf support for leaving out lustre's own remove_proc_subtree() if there is one in linux, but on careful examination it appears the linux instances aren't quite identical to the lustre implementation. I think the best course is to change the lustre routine back to its original name, so it won't conflict. I will push a patch to do so.

The only reason this hasn't shown up in current review builds is that it is only a problem in the newest el6.6 (not yet landed) and in server builds. We aren't doing el7 server builds yet.

Issue Links

• is related to: LU-5275 clean up technical debt for proc_dir_...

Comments

[James A Simmons]

I have one last patch for LU-5275 coming which should address these problems.

[Dmitry Eremin (Inactive)]

James, which patch you are talking about? In http://review.whamcloud.com/12235 you have the same issue. I cannot find other pathes for LU-5275.

[Dmitry Eremin (Inactive)]

The issue is you define following function:

#ifndef HAVE_ONLY_PROCFS_SEQ
extern void remove_proc_subtree(const char *name,
				struct proc_dir_entry *parent);
#endif

but in Linux headers we have following:

extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent);

[Gerrit Updater]

Bob Glossman ([e-mail]) uploaded a new patch: http://review.whamcloud.com/12931
Subject: LU-5983 build: fix build failures from recent landing
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 85fcc6f4df4718c9ec44d596ee0f5fed226303a4

[James A Simmons]

Dmitry in the new patch I fixed that. Bob does RHEL6.6 define proc_remove()?

[Bob Glossman (Inactive)]

James, I see EXPORT_SYMBOL(remove_proc_subtree). I don't see any export proc_remove

[Bob Glossman (Inactive)]

just a simple rename didn't work. see build failure of http://review.whamcloud.com/12931

[James A Simmons]

The latest patch from LU-5275 might of fixed it. Will see the fall out in Maloo soon.

[James A Simmons]

Patch http://review.whamcloud.com/#/c/12235 should resolve this.

[James A Simmons]

Patch has been reverted. We can close this ticket.

[Jodi Levi (Inactive)]

Closing ticket per last comment. Patch was reverted.