The patch titled
nilfs2: remove nilfs bmap wrapper macros
has been added to the -mm tree. Its filename is
nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: nilfs2: remove nilfs bmap wrapper macros
From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
This patch removes bunch of bmap wrapper macros from fs/nilfs/bmap.h.
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Acked-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nilfs2/bmap.c | 16 ++++++++--------
fs/nilfs2/bmap.h | 7 -------
2 files changed, 8 insertions(+), 15 deletions(-)
diff -puN fs/nilfs2/bmap.c~nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros fs/nilfs2/bmap.c
--- a/fs/nilfs2/bmap.c~nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros
+++ a/fs/nilfs2/bmap.c
@@ -100,7 +100,7 @@ static int nilfs_bmap_do_insert(struct n
bmap, keys, ptrs, NILFS_BMAP_SMALL_HIGH + 1);
if (n < 0)
return n;
- ret = (*nilfs_bmap_large_convert_and_insert)(
+ ret = nilfs_btree_convert_and_insert(
bmap, key, ptr, keys, ptrs, n,
NILFS_BMAP_LARGE_LOW, NILFS_BMAP_LARGE_HIGH);
if (ret == 0)
@@ -157,7 +157,7 @@ static int nilfs_bmap_do_delete(struct n
bmap, keys, ptrs, NILFS_BMAP_LARGE_LOW + 1);
if (n < 0)
return n;
- ret = (*nilfs_bmap_small_delete_and_convert)(
+ ret = nilfs_direct_delete_and_convert(
bmap, key, keys, ptrs, n,
NILFS_BMAP_SMALL_LOW, NILFS_BMAP_SMALL_HIGH);
if (ret == 0)
@@ -730,12 +730,12 @@ int nilfs_bmap_read(struct nilfs_bmap *b
}
return (bmap->b_u.u_flags & NILFS_BMAP_LARGE) ?
- nilfs_bmap_large_init(bmap,
- NILFS_BMAP_LARGE_LOW,
- NILFS_BMAP_LARGE_HIGH) :
- nilfs_bmap_small_init(bmap,
- NILFS_BMAP_SMALL_LOW,
- NILFS_BMAP_SMALL_HIGH);
+ nilfs_btree_init(bmap,
+ NILFS_BMAP_LARGE_LOW,
+ NILFS_BMAP_LARGE_HIGH) :
+ nilfs_direct_init(bmap,
+ NILFS_BMAP_SMALL_LOW,
+ NILFS_BMAP_SMALL_HIGH);
}
/**
diff -puN fs/nilfs2/bmap.h~nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros fs/nilfs2/bmap.h
--- a/fs/nilfs2/bmap.h~nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros
+++ a/fs/nilfs2/bmap.h
@@ -241,11 +241,4 @@ static inline void nilfs_bmap_clear_dirt
#define NILFS_BMAP_LARGE_LOW NILFS_BTREE_ROOT_NCHILDREN_MAX
#define NILFS_BMAP_LARGE_HIGH NILFS_BTREE_KEY_MAX
-#define nilfs_bmap_small_init nilfs_direct_init
-#define nilfs_bmap_small_convert_and_insert NULL
-#define nilfs_bmap_small_delete_and_convert nilfs_direct_delete_and_convert
-#define nilfs_bmap_large_init nilfs_btree_init
-#define nilfs_bmap_large_convert_and_insert nilfs_btree_convert_and_insert
-#define nilfs_bmap_large_delete_and_convert NULL
-
#endif /* _NILFS_BMAP_H */
_
Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are
repeatable-slab-corruption-with-ltp-msgctl08.patch
linux-next.patch
ext4-allocate-s_blockgroup_lock-separately.patch
nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros.patch
nilfs2-avoid-double-error-caused-by-nilfs_transaction_end.patch
slab-leaks3-default-y.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
