From 3e7c3dbf652d7e576807469a851049dca923c884 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 15 Sep 2016 18:22:17 -0400 Subject: [PATCH] add patch remove-debris-from-bgl_lock_ptr-conversion --- remove-debris-from-bgl_lock_ptr-conversion | 38 ++++++++++++++++++++++++++++++ series | 1 + timestamps | 7 +++--- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 remove-debris-from-bgl_lock_ptr-conversion diff --git a/remove-debris-from-bgl_lock_ptr-conversion b/remove-debris-from-bgl_lock_ptr-conversion new file mode 100644 index 00000000..97d744aa --- /dev/null +++ b/remove-debris-from-bgl_lock_ptr-conversion @@ -0,0 +1,38 @@ +blockgroup_lock.h: remove debris from bgl_lock_ptr() conversion + +From: Eric Biggers + +An obsolete comment and extra parentheses were left over from when the +sb_bgl_lock() macro was replaced with the bgl_lock_ptr() function. + +Signed-off-by: Eric Biggers +Signed-off-by: Theodore Ts'o +Reviewed-by: Andreas Dilger +--- + include/linux/blockgroup_lock.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/include/linux/blockgroup_lock.h b/include/linux/blockgroup_lock.h +index e44b88b..61b583d 100644 +--- a/include/linux/blockgroup_lock.h ++++ b/include/linux/blockgroup_lock.h +@@ -49,14 +49,10 @@ static inline void bgl_lock_init(struct blockgroup_lock *bgl) + spin_lock_init(&bgl->locks[i].lock); + } + +-/* +- * The accessor is a macro so we can embed a blockgroup_lock into different +- * superblock types +- */ + static inline spinlock_t * + bgl_lock_ptr(struct blockgroup_lock *bgl, unsigned int block_group) + { +- return &bgl->locks[(block_group) & (NR_BG_LOCKS-1)].lock; ++ return &bgl->locks[block_group & (NR_BG_LOCKS-1)].lock; + } + + #endif +-- +2.8.0.rc3.226.g39d4020 + + diff --git a/series b/series index 66897110..31b1478a 100644 --- a/series +++ b/series @@ -27,6 +27,7 @@ fscrypto-improved-validation-when-loading-inode-encryption-metadata fscrypto-remove-unnecessary-includes fscrypto-rename-completion-callbacks-to-reflect-usage fscrypto-make-filename-crypto-functions-return-0-on-success +remove-debris-from-bgl_lock_ptr-conversion ########################################## # unstable patches diff --git a/timestamps b/timestamps index 0f8d4e5a..aad6f62b 100755 --- a/timestamps +++ b/timestamps @@ -65,6 +65,7 @@ touch -d @1473972069 fscrypto-remove-unnecessary-includes touch -d @1473972661 fscrypto-rename-completion-callbacks-to-reflect-usage touch -d @1473972721 stable-boundary touch -d @1473974755 fscrypto-make-filename-crypto-functions-return-0-on-success -touch -d @1473974756 status -touch -d @1473977381 series -touch -d @1473977386 timestamps +touch -d @1473978089 series +touch -d @1473978307 remove-debris-from-bgl_lock_ptr-conversion +touch -d @1473978313 status +touch -d @1473978316 timestamps -- 2.11.4.GIT