Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / drivers / dma-buf / reservation.c

diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index 39920d77f288d7802c054130acf72caa8f40465d..c0bd5722c997e29d36a2771f18d4feb9b44c5a74 100644 (file)
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -337,7 +337,8 @@ retry:
        rcu_read_lock();
 
        if (wait_all) {
-               struct reservation_object_list *fobj = rcu_dereference(obj->fence);
+               struct reservation_object_list *fobj =
+                                               rcu_dereference(obj->fence);
 
                if (fobj)
                        shared_count = fobj->shared_count;
@@ -429,7 +430,8 @@ retry:
        if (test_all) {
                unsigned i;
 
-               struct reservation_object_list *fobj = rcu_dereference(obj->fence);
+               struct reservation_object_list *fobj =
+                                               rcu_dereference(obj->fence);
 
                if (fobj)
                        shared_count = fobj->shared_count;
@@ -462,7 +464,8 @@ retry:
                        goto unlock_retry;
 
                if (fence_excl) {
-                       ret = reservation_object_test_signaled_single(fence_excl);
+                       ret = reservation_object_test_signaled_single(
+                                                               fence_excl);
                        if (ret < 0)
                                goto unlock_retry;
                }