[LU-2757] Move dynlocks out of ldiskfs

• Status: Resolved
• Project: Lustre
• Fix Version/s: Lustre 2.5.0
• Type: Improvement
• Priority: Minor
• Reporter: Jeff Mahoney
• Assignee: Bob Glossman (Inactive)
• Resolution: Fixed
• Labels: patch

Description

Commit 43603bd1 (LU-1548 osd: move i_htree_lock to iam container) eliminated the use of dynlocks inside ldiskfs. Now that it's only used in the system-agnostic mdd and osd-ldiskfs code, we can move it under lustre/ and eliminate a patch we apply during build.

Issue Links

• is duplicated by: LU-2564 move dynlock from ldiskfs to osd-ldiskfs

Comments

[James A Simmons]

The mdd layer uses the dynlock code. How did it ever work on ZFS?

[James A Simmons]

With the current patch the dynlock code in placed in lustre/dynlocks. Andreas where do recommend that it be placed in the tree? Would obdclass make a logical choice since this code is used by mdd and osd-ldiskfs layers?

[Jeff Mahoney]

I was wondering that too when I was build testing and the mdd Makefile didn't have the proper include path. The mdd layer can use the dynlock code but isn't currently because MDD_DISABLE_PDO_LOCK is set. The comment indicates it's because it's already protected by the LDLM.

[Bob Glossman (Inactive)]

Is it just me or is build of dynlocks.c failing to find dynlocks.h ?
Seems to be missing a -I in new lustre/dynlocks/Makefile.in

[Jeff Mahoney]

My builds succeed but you're right, there should be a -I in there.

[Bob Glossman (Inactive)]

The 1 line fix below seems to fix it for me.

--- a/lustre/dynlocks/Makefile.in
+++ b/lustre/dynlocks/Makefile.in
@@ -2,7 +2,7 @@ all: modules
 install: modules_install
 distdir:
 
-EXTRA_CFLAGS += -include @abs_top_builddir@/config.h
+EXTRA_CFLAGS += -include @abs_top_builddir@/config.h -I@abs_top_builddir@/lustre/dynlocks
 
 sources := dynlocks.c dynlocks.h

[Jeff Mahoney]

I think that should probably be:

--- a/lustre/dynlocks/Makefile.in
+++ b/lustre/dynlocks/Makefile.in
@@ -2,7 +2,7 @@ all: modules
 install: modules_install
 distdir:
 
-EXTRA_CFLAGS += -include @abs_top_builddir@/config.h
+EXTRA_CFLAGS += -include @abs_top_builddir@/config.h -I@abs_srcdir@
 
 sources := dynlocks.c dynlocks.h

[Bob Glossman (Inactive)]

If dynlocks is going to be a whole new kernel module as proposed in the patch, then it will need some work to be dealt with properly in various tools like 'lctl modules' and lustre_rmmod.

[James A Simmons]

Yuck. Where this code goes depends on if the mdd layer will ever use dynlock. If it wouldn't then it can be moved to osd-ldiskfs. If dynlock will be used with mdd then I suggest it go into the obdclass.

[Jeff Mahoney]

Ok, it makes sense to add it to an already existing dependency of both oxd-ldiskfs and mdd. I'll update the patch to move it to obdclass.

[James A Simmons]

Updated the patch Alex as you suggested. Now that 2.4 is frozen we can label this a 2.5 item

[Andreas Dilger]

http://review.whamcloud.com/5282

[James A Simmons]

This patch has just landed. Peter you can close this ticket.