From 3c8f001801c46d1756316b1e80c18b5a3e4f5e23 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 28 Jun 2013 15:41:07 -0600 Subject: [PATCH] LU-1346 contrib: fix libcfs_cleanup script Fix up some warnings in the contrib/scripts/libcfs_cleanup.sed script. Add a comment with details on how to run the script to find missing conversions. Exclude the gnilnd subdirectory, as James prefers to update this himself. Signed-off-by: Andreas Dilger Change-Id: If61c4318e9d4e7bb59592dfef5c9ee4f973ebbe5 Reviewed-on: http://review.whamcloud.com/6824 Reviewed-by: Christopher J. Morrone Reviewed-by: Bob Glossman Tested-by: Hudson Reviewed-by: James Simmons Tested-by: Maloo --- autoMakefile.am | 2 +- contrib/scripts/libcfs_cleanup.sed | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index b607947..069219d 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -68,7 +68,7 @@ mkid: doxygen: doxygen-api doxygen-ref doxygen-%: build/doxyfile.% - doxygen $< + doxygen $< if MODULES sources: all-sources diff --git a/contrib/scripts/libcfs_cleanup.sed b/contrib/scripts/libcfs_cleanup.sed index 717d8ed..8b81fec 100644 --- a/contrib/scripts/libcfs_cleanup.sed +++ b/contrib/scripts/libcfs_cleanup.sed @@ -4,6 +4,10 @@ # Migrate libcfs to emulate Linux kernel APIs. # http://jira.whamcloud.com/browse/LU-1346 +# Run this script like: +# find libcfs lnet lustre -name "*.[ch]" | grep -v gnilnd | +# xargs sed -i "" -f contrib/scripts/libcfs_cleanup.sed + ################################################################################ # lock - spinlock, rw_semaphore, rwlock, completion, semaphore, mutex @@ -88,7 +92,7 @@ s/\bcfs_read_unlock\b/read_unlock/g /#[ \t]*define[ \t]*\bread_unlock\b *( *\w* *)[ \t]*\bread_unlock\b *( *\w* *)/d s/\bcfs_read_unlock_irqrestore\b/read_unlock_irqrestore/g #/#[ \t]*define[ \t]*\bread_unlock_irqrestore\b *( *\w* *)[ \t]*\bread_unlock_irqrestore\b *( *\w* *)/d -/#define read_unlock_irqrestore(lock,flags) \\/{N;d} +/#define read_unlock_irqrestore(lock,flags) \\/{N;d;} s/\bcfs_write_lock\b/write_lock/g /#[ \t]*define[ \t]*\bwrite_lock\b *( *\w* *)[ \t]*\bwrite_lock\b *( *\w* *)/d s/\bcfs_write_unlock\b/write_unlock/g @@ -120,7 +124,7 @@ s/\bcfs_complete\b/complete/g s/\bcfs_wait_for_completion\b/wait_for_completion/g /#[ \t]*define[ \t]*\bwait_for_completion\b *( *\w* *)[ \t]*\bwait_for_completion\b *( *\w* *)/d s/\bcfs_wait_for_completion_interruptible\b/wait_for_completion_interruptible/g -/#define wait_for_completion_interruptible(c) \\/{N;d} +/#define wait_for_completion_interruptible(c) \\/{N;d;} s/\bcfs_complete_and_exit\b/complete_and_exit/g /#[ \t]*define[ \t]*\bcomplete_and_exit\b *( *\w* *, *\w* *)[ \t]*\bcomplete_and_exit\b *( *\w* *, *\w* *)/d s/\bcfs_fini_completion\b/fini_completion/g @@ -177,7 +181,7 @@ s/\bcfs_lockdep_on\b/lockdep_on/g s/\bcfs_mutex_lock_nested\b/mutex_lock_nested/g #/#[ \t]*define[ \t]*\bmutex_lock_nested\b *( *\w* *, *\w* *)[ \t]*\bmutex_lock_nested\b *( *\w* *, *\w* *)/d -/#define mutex_lock_nested(mutex, subclass) \\/{N;d} +/#define mutex_lock_nested(mutex, subclass) \\/{N;d;} s/\bcfs_spin_lock_nested\b/spin_lock_nested/g /#[ \t]*define[ \t]*\bspin_lock_nested\b *( *\w* *, *\w* *)[ \t]*\bspin_lock_nested\b *( *\w* *, *\w* *)/d s/\bcfs_down_read_nested\b/down_read_nested/g @@ -205,7 +209,7 @@ s/\bcfs_find_first_zero_bit\b/find_first_zero_bit/g s/\bcfs_find_next_bit\b/find_next_bit/g /#[ \t]*define[ \t]*\bfind_next_bit\b *( *\w* *, *\w* *, *\w* *)[ \t]*\bfind_next_bit\b *( *\w* *, *\w* *, *\w* *)/d s/\bcfs_find_next_zero_bit\b/find_next_zero_bit/g -/#define find_next_zero_bit(addr, size, off) \\/{N;d} +/#define find_next_zero_bit(addr, size, off) \\/{N;d;} s/\bcfs_ffz\b/ffz/g /#[ \t]*define[ \t]*\bffz\b *( *\w* *)[ \t]*\bffz\b *( *\w* *)/d s/\bcfs_ffs\b/ffs/g -- 1.8.3.1