Merge tag 'omapdss-for-3.7' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next

Omapdss driver changes for the 3.7 merge window.

Notable changes:

* Basic writeback support for DISPC level. Writeback is not yet usable, though,
  as we need higher level code to actually expose the writeback feature to
  userspace.
* Rewriting the omapdss output drivers. We're trying to remove the hard links
  between the omapdss and the panels, and this rewrite work moves us closer to
  that goal.
* Cleanup and restructuring patches that have been made while working on device
  tree support for omapdss. Device tree support is still some way ahead, but
  these patches are good cleanups in themselves.
* Basic OMAP5 DSS support for DPI and DSI outputs.
* Workaround for the problem that GFX overlay's fifo is too small for high
  resolution scenarios, causing underflows.
* Cleanups that remove dependencies to omap platform code.

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 335605c8ceab..07d5eeb1e6f1 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -512,8 +512,8 @@ static void __btrfs_remove_delayed_item(struct btrfs_delayed_item *delayed_item)
 
         rb_erase(&delayed_item->rb_node, root);
         delayed_item->delayed_node->count--;
-        atomic_dec(&delayed_root->items);
-        if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND &&
+        if (atomic_dec_return(&delayed_root->items) <
+            BTRFS_DELAYED_BACKGROUND &&
             waitqueue_active(&delayed_root->wait))
                 wake_up(&delayed_root->wait);
 }
@@ -1028,9 +1028,10 @@ do_again:
                 btrfs_release_delayed_item(prev);
                 ret = 0;
                 btrfs_release_path(path);
-                if (curr)
+                if (curr) {
+                        mutex_unlock(&node->mutex);
                         goto do_again;
-                else
+                } else
                         goto delete_fail;
         }
 
@@ -1055,8 +1056,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node)
                 delayed_node->count--;
 
                 delayed_root = delayed_node->root->fs_info->delayed_root;
-                atomic_dec(&delayed_root->items);
-                if (atomic_read(&delayed_root->items) <
+                if (atomic_dec_return(&delayed_root->items) <
                     BTRFS_DELAYED_BACKGROUND &&
                     waitqueue_active(&delayed_root->wait))
                         wake_up(&delayed_root->wait);