ext4: remove dynamic block cache allocation in ext4_mount

[lwext4.git] / prefix_patch / lwext4_rename.sh

diff --git a/prefix_patch/lwext4_rename.sh b/prefix_patch/lwext4_rename.sh
index bbdc3245717dc1520421fc79514debdf22eb59a4..0c90ff219b220c1e010f329a1f90f243c853c120 100755 (executable)
--- a/prefix_patch/lwext4_rename.sh
+++ b/prefix_patch/lwext4_rename.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREFIX_TO_ADD=LWEXT4
+MACRO_NAME=LWEXT4
 EXT4_ERRNO_H=ext4_errno.h
 EXT4_OFLAGS_H=ext4_oflags.h
 USED_ERRNO_FILE=/tmp/used_errno
@@ -33,12 +33,12 @@ for errno in $(cat $USED_ERRNO_FILE);do
        echo "For $errno"
        for file in $(find . -name "*.c" | xargs -n 1);do
                if [[ $(basename $file) != $EXT4_ERRNO_H ]];then
-                       sed -i "s/\\<${errno}\\>/${PREFIX_TO_ADD}_${errno}/g" $file
+                       sed -i "/${MACRO_NAME}_ERRNO(${errno})/b;s/\\<${errno}\\>/${MACRO_NAME}_ERRNO(${errno})/g" $file
                fi
        done
        for file in $(find . -name "*.h" | xargs -n 1);do
                if [[ $(basename $file) != $EXT4_ERRNO_H ]];then
-                       sed -i "s/\\<${errno}\\>/${PREFIX_TO_ADD}_${errno}/g" $file
+                       sed -i "/${MACRO_NAME}_ERRNO(${errno})/b;s/\\<${errno}\\>/${MACRO_NAME}_ERRNO(${errno})/g" $file
                fi
        done
 done
@@ -48,18 +48,18 @@ for oflags in $(cat $USED_OFLAGS_FILE);do
        for file in $(find . -name "*.c" | xargs -n 1);do
                if [[ $(dirname $file) != "./blockdev/"* &&  \
                      $(basename $file) != $EXT4_OFLAGS_H ]];then
-                       sed -i "s/\\<${oflags}\\>/${PREFIX_TO_ADD}_${oflags}/g" $file
+               sed -i "/${MACRO_NAME}_FLAGS(${oflags})/b;s/\\<${oflags}\\>/${MACRO_NAME}_FLAGS(${oflags})/g" $file
                fi
        done
        for file in $(find . -name "*.h" | xargs -n 1);do
                if [[ $(dirname $file) != "./blockdev/"* &&  \
                      $(basename $file) != $EXT4_OFLAGS_H ]];then
-                       sed -i "s/\\<${oflags}\\>/${PREFIX_TO_ADD}_${oflags}/g" $file
+               sed -i "/${MACRO_NAME}_FLAGS(${oflags})/b;s/\\<${oflags}\\>/${MACRO_NAME}_FLAGS(${oflags})/g" $file
                fi
        done
 done
 
 # Do final patching.
 for patches in $(dirname $0)/*.patch ;do
-       patch -p0 < $patches
+       patch -p1 < $patches
 done