Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index fe50ded1b4ce..498641eed2db 100644
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -139,11 +139,16 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
 
                 lock_buffer(bh);
                 if (buffer_jbd(bh)) {
+#ifdef CATCH_BH_JBD_RACES
                         mlog(ML_ERROR,
                              "block %llu had the JBD bit set "
                              "while I was in lock_buffer!",
                              (unsigned long long)bh->b_blocknr);
                         BUG();
+#else
+                        unlock_buffer(bh);
+                        continue;
+#endif
                 }
 
                 clear_buffer_uptodate(bh);