The patch titled
reiser4: cryptcompress misc fixups-2
has been removed from the -mm tree. Its filename was
reiser4-cryptcompress-misc-fixups-2.patch
This patch was dropped because it was folded into reiser4.patch
------------------------------------------------------
Subject: reiser4: cryptcompress misc fixups-2
From: Edward Shishkin <edward@xxxxxxxxxxx>
Check a file plugin id before manipulating with plugin-specific counter.
Signed-off-by: Edward Shishkin <edward@xxxxxxxxxxx>
Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/reiser4/plugin/file/cryptcompress.h | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff -puN fs/reiser4/plugin/file/cryptcompress.h~reiser4-cryptcompress-misc-fixups-2 fs/reiser4/plugin/file/cryptcompress.h
--- a/fs/reiser4/plugin/file/cryptcompress.h~reiser4-cryptcompress-misc-fixups-2
+++ a/fs/reiser4/plugin/file/cryptcompress.h
@@ -38,11 +38,23 @@ static inline int cluster_shift_ok(int s
#if REISER4_DEBUG
#define INODE_PGCOUNT(inode) \
- (atomic_read(&cryptcompress_inode_data(inode)->pgcount))
+({ \
+ assert("edward-1530", inode_file_plugin(inode) == \
+ file_plugin_by_id(CRYPTCOMPRESS_FILE_PLUGIN_ID)); \
+ atomic_read(&cryptcompress_inode_data(inode)->pgcount); \
+ })
#define INODE_PGCOUNT_INC(inode) \
- (atomic_inc(&cryptcompress_inode_data(inode)->pgcount))
+do { \
+ assert("edward-1531", inode_file_plugin(inode) == \
+ file_plugin_by_id(CRYPTCOMPRESS_FILE_PLUGIN_ID)); \
+ atomic_inc(&cryptcompress_inode_data(inode)->pgcount); \
+} while (0)
#define INODE_PGCOUNT_DEC(inode) \
- (atomic_dec(&cryptcompress_inode_data(inode)->pgcount))
+do { \
+ if (inode_file_plugin(inode) == \
+ file_plugin_by_id(CRYPTCOMPRESS_FILE_PLUGIN_ID)) \
+ atomic_dec(&cryptcompress_inode_data(inode)->pgcount); \
+} while (0)
#else
#define INODE_PGCOUNT(inode) (0)
#define INODE_PGCOUNT_INC(inode)
_
Patches currently in -mm which might be from edward@xxxxxxxxxxx are
origin.patch
reiser4.patch
reiser4-cryptcompress-misc-fixups-2.patch
reiser4-cryptcompress-misc-fixups-make-3-functions-static.patch
reiser4-change-error-code-base.patch
reiser4-use-lzo-library-functions.patch
fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch
reiser4-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-init_superc-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc.patch
git-nfsd-broke-reiser4.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
