Whamcloud - gitweb
Revert "LU-1346 libcfs: replace CFS_CAP_XXX with kernel definition"
[fs/lustre-release.git] / contrib / scripts / libcfs_cleanup.sed
index bcc7834..556892c 100644 (file)
@@ -631,24 +631,3 @@ s/\bcfs_atomic_sub_return\b/atomic_sub_return/g
 /#[ \t]*define[ \t]*\batomic_sub_return\b *( *\w* *, *\w* *)[ \t]*\batomic_sub_return\b *( *\w* *, *\w* *)/d
 s/\bCFS_ATOMIC_INIT\b/ATOMIC_INIT/g
 /#[ \t]*define[ \t]*\bATOMIC_INIT\b *( *\w* *)[ \t]*\bATOMIC_INIT\b *( *\w* *)/d
-
-################################################################################
-# CFS_CAP_XXX
-s/\bCFS_CAP_CHOWN\b/CAP_CHOWN/g
-/#[ \t]*define[ \t]*\bCAP_CHOWN\b[ \t]*\bCAP_CHOWN\b/d
-s/\bCFS_CAP_DAC_OVERRIDE\b/CAP_DAC_OVERRIDE/g
-/#[ \t]*define[ \t]*\bCAP_DAC_OVERRIDE\b[ \t]*\bCAP_DAC_OVERRIDE\b/d
-s/\bCFS_CAP_DAC_READ_SEARCH\b/CAP_DAC_READ_SEARCH/g
-/#[ \t]*define[ \t]*\bCAP_DAC_READ_SEARCH\b[ \t]*\bCAP_DAC_READ_SEARCH\b/d
-s/\bCFS_CAP_FOWNER\b/CAP_FOWNER/g
-/#[ \t]*define[ \t]*\bCAP_FOWNER\b[ \t]*\bCAP_FOWNER\b/d
-s/\bCFS_CAP_FSETID\b/CAP_FSETID/g
-/#[ \t]*define[ \t]*\bCAP_FSETID\b[ \t]*\bCAP_FSETID\b/d
-s/\bCFS_CAP_LINUX_IMMUTABLE\b/CAP_LINUX_IMMUTABLE/g
-/#[ \t]*define[ \t]*\bCAP_LINUX_IMMUTABLE\b[ \t]*\bCAP_LINUX_IMMUTABLE\b/d
-s/\bCFS_CAP_SYS_ADMIN\b/CAP_SYS_ADMIN/g
-/#[ \t]*define[ \t]*\bCAP_SYS_ADMIN\b[ \t]*\bCAP_SYS_ADMIN\b/d
-s/\bCFS_CAP_SYS_BOOT\b/CAP_SYS_BOOT/g
-/#[ \t]*define[ \t]*\bCAP_SYS_BOOT\b[ \t]*\bCAP_SYS_BOOT\b/d
-s/\bCFS_CAP_SYS_RESOURCE\b/CAP_SYS_RESOURCE/g
-/#[ \t]*define[ \t]*\bCAP_SYS_RESOURCE\b[ \t]*\bCAP_SYS_RESOURCE\b/d