The patch titled
Subject: prio_tree: fix fs/block_dev.c for removal of prio_tree
has been removed from the -mm tree. Its filename was
prio_tree-remove-fix.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: prio_tree: fix fs/block_dev.c for removal of prio_tree
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Michel Lespinasse <walken@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/block_dev.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/block_dev.c~prio_tree-remove-fix fs/block_dev.c
--- a/fs/block_dev.c~prio_tree-remove-fix
+++ a/fs/block_dev.c
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
#include <linux/cleancache.h>
+#include <linux/rbtree.h>
#include <asm/uaccess.h>
#include "internal.h"
@@ -132,7 +133,7 @@ int set_blocksize(struct block_device *b
/* Check that the block device is not memory mapped */
mapping = bdev->bd_inode->i_mapping;
mutex_lock(&mapping->i_mmap_mutex);
- if (!prio_tree_empty(&mapping->i_mmap) ||
+ if (!RB_EMPTY_ROOT(&mapping->i_mmap) ||
!list_empty(&mapping->i_mmap_nonlinear)) {
mutex_unlock(&mapping->i_mmap_mutex);
percpu_up_write(&bdev->bd_block_size_semaphore);
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
arch-powerpc-platforms-pseries-hotplug-memoryc-fix-section-handling-code.patch
linux-next.patch
fs-block_devc-set_blocksize-use-mapping_mapped.patch
kernel-forkc-export-kernel_thread-to-modules.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
