The patch titled
Subject: prio_tree: fix fs/block_dev.c for removal of prio_tree
has been added to the -mm tree. Its filename is
prio_tree-remove-fix.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 ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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
linux-next.patch
rbtree-empty-nodes-have-no-color-fix.patch
prio_tree-remove-fix.patch
atomic-implement-generic-atomic_dec_if_positive.patch
atomic-implement-generic-atomic_dec_if_positive-fix.patch
idr-rename-max_level-to-max_idr_level-fix-fix-2-fix.patch
rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix.patch
rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix.patch
coredump-pass-siginfo_t-to-do_coredump-and-below-not-merely-signr.patch
compat-move-compat_siginfo_t-definition-to-asm-compath.patch
coredump-add-a-new-elf-note-with-siginfo-of-the-signal.patch
coredump-extend-core-dump-note-section-to-contain-file-names-of-mapped-files.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
