diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-05 03:07:56 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-05 03:07:56 +0000 |
commit | 3802480ff6e526cec65e31b2c82d135039e34766 (patch) | |
tree | 764b2e48a5b91fcb2dbea10f6aadf09e7b181ddc | |
parent | 2568204ae18e22ebef7f5c2b7a25374d5e172507 (diff) | |
download | upstream-3802480ff6e526cec65e31b2c82d135039e34766.tar.gz upstream-3802480ff6e526cec65e31b2c82d135039e34766.tar.bz2 upstream-3802480ff6e526cec65e31b2c82d135039e34766.zip |
[generic] fix unbalanced mutex_lock/mutex_unlock in mini_fo getxattr op. Thanks Daniel Dickinson for tracking this down
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24906 3c298f89-4303-0410-b956-a3cf2f4a3e73
7 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-2.6.30/209-mini_fo.patch b/target/linux/generic/patches-2.6.30/209-mini_fo.patch index bb6f381a14..16d880b66e 100644 --- a/target/linux/generic/patches-2.6.30/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.30/209-mini_fo.patch @@ -3454,7 +3454,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.31/209-mini_fo.patch b/target/linux/generic/patches-2.6.31/209-mini_fo.patch index e3ce162ad7..0886c6be25 100644 --- a/target/linux/generic/patches-2.6.31/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.31/209-mini_fo.patch @@ -3454,7 +3454,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.32/209-mini_fo.patch b/target/linux/generic/patches-2.6.32/209-mini_fo.patch index 0b4091c64e..8f9140ac5b 100644 --- a/target/linux/generic/patches-2.6.32/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.32/209-mini_fo.patch @@ -3454,7 +3454,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.34/209-mini_fo.patch b/target/linux/generic/patches-2.6.34/209-mini_fo.patch index d7e3220d24..f1587786dd 100644 --- a/target/linux/generic/patches-2.6.34/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.34/209-mini_fo.patch @@ -3456,7 +3456,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.35/209-mini_fo.patch b/target/linux/generic/patches-2.6.35/209-mini_fo.patch index d7e3220d24..f1587786dd 100644 --- a/target/linux/generic/patches-2.6.35/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.35/209-mini_fo.patch @@ -3456,7 +3456,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.36/209-mini_fo.patch b/target/linux/generic/patches-2.6.36/209-mini_fo.patch index 10900b4e18..767606dbd7 100644 --- a/target/linux/generic/patches-2.6.36/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.36/209-mini_fo.patch @@ -3456,7 +3456,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif diff --git a/target/linux/generic/patches-2.6.37/209-mini_fo.patch b/target/linux/generic/patches-2.6.37/209-mini_fo.patch index a6566beb96..065f186d5b 100644 --- a/target/linux/generic/patches-2.6.37/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.37/209-mini_fo.patch @@ -3456,7 +3456,7 @@ + err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size); + /* unlock_kernel() will be done by caller. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+ mutex_lock(&hidden_dentry->d_inode->i_mutex); ++ mutex_unlock(&hidden_dentry->d_inode->i_mutex); +#else + up(&hidden_dentry->d_inode->i_sem); +#endif |