1 files changed, 21 insertions, 20 deletions

diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index d3ffad61c6b8..fa279da5be2c 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -89,7 +89,7 @@ static void mark_block(struct drm_device * dev, struct mem_block *p, int in_use)
  */
 
 static struct mem_block *split_block(struct mem_block *p, int start, int size,
-                                     DRMFILE filp)
+                                     struct drm_file *file_priv)
 {
         /* Maybe cut off the start of an existing block */
         if (start > p->start) {
@@ -99,7 +99,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
                         goto out;
                 newblock->start = start;
                 newblock->size = p->size - (start - p->start);
-                newblock->filp = NULL;
+                newblock->file_priv = NULL;
                 newblock->next = p->next;
                 newblock->prev = p;
                 p->next->prev = newblock;
@@ -116,7 +116,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
                         goto out;
                 newblock->start = start + size;
                 newblock->size = p->size - size;
-                newblock->filp = NULL;
+                newblock->file_priv = NULL;
                 newblock->next = p->next;
                 newblock->prev = p;
                 p->next->prev = newblock;
@@ -126,20 +126,20 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
 
       out:
         /* Our block is in the middle */
-        p->filp = filp;
+        p->file_priv = file_priv;
         return p;
 }
 
 static struct mem_block *alloc_block(struct mem_block *heap, int size,
-                                     int align2, DRMFILE filp)
+                                     int align2, struct drm_file *file_priv)
 {
         struct mem_block *p;
         int mask = (1 << align2) - 1;
 
         for (p = heap->next; p != heap; p = p->next) {
                 int start = (p->start + mask) & ~mask;
-                if (p->filp == NULL && start + size <= p->start + p->size)
-                        return split_block(p, start, size, filp);
+                if (p->file_priv == NULL && start + size <= p->start + p->size)
+                        return split_block(p, start, size, file_priv);
         }
 
         return NULL;
@@ -158,12 +158,12 @@ static struct mem_block *find_block(struct mem_block *heap, int start)
 
 static void free_block(struct mem_block *p)
 {
-        p->filp = NULL;
+        p->file_priv = NULL;
 
-        /* Assumes a single contiguous range.  Needs a special filp in
+        /* Assumes a single contiguous range.  Needs a special file_priv in
          * 'heap' to stop it being subsumed.
          */
-        if (p->next->filp == NULL) {
+        if (p->next->file_priv == NULL) {
                 struct mem_block *q = p->next;
                 p->size += q->size;
                 p->next = q->next;
@@ -171,7 +171,7 @@ static void free_block(struct mem_block *p)
                 drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS);
         }
 
-        if (p->prev->filp == NULL) {
+        if (p->prev->file_priv == NULL) {
                 struct mem_block *q = p->prev;
                 q->size += p->size;
                 q->next = p->next;
@@ -197,18 +197,19 @@ static int init_heap(struct mem_block **heap, int start, int size)
 
         blocks->start = start;
         blocks->size = size;
-        blocks->filp = NULL;
+        blocks->file_priv = NULL;
         blocks->next = blocks->prev = *heap;
 
         memset(*heap, 0, sizeof(**heap));
-        (*heap)->filp = (DRMFILE) - 1;
+        (*heap)->file_priv = (struct drm_file *) - 1;
         (*heap)->next = (*heap)->prev = blocks;
         return 0;
 }
 
 /* Free all blocks associated with the releasing file.
  */
-void i915_mem_release(struct drm_device * dev, DRMFILE filp, struct mem_block *heap)
+void i915_mem_release(struct drm_device * dev, struct drm_file *file_priv,
+                      struct mem_block *heap)
 {
         struct mem_block *p;
 
@@ -216,17 +217,17 @@ void i915_mem_release(struct drm_device * dev, DRMFILE filp, struct mem_block *h
                 return;
 
         for (p = heap->next; p != heap; p = p->next) {
-                if (p->filp == filp) {
-                        p->filp = NULL;
+                if (p->file_priv == file_priv) {
+                        p->file_priv = NULL;
                         mark_block(dev, p, 0);
                 }
         }
 
-        /* Assumes a single contiguous range.  Needs a special filp in
+        /* Assumes a single contiguous range.  Needs a special file_priv in
          * 'heap' to stop it being subsumed.
          */
         for (p = heap->next; p != heap; p = p->next) {
-                while (p->filp == NULL && p->next->filp == NULL) {
+                while (p->file_priv == NULL && p->next->file_priv == NULL) {
                         struct mem_block *q = p->next;
                         p->size += q->size;
                         p->next = q->next;
@@ -292,7 +293,7 @@ int i915_mem_alloc(DRM_IOCTL_ARGS)
         if (alloc.alignment < 12)
                 alloc.alignment = 12;
 
-        block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
+        block = alloc_block(*heap, alloc.size, alloc.alignment, file_priv);
 
         if (!block)
                 return -ENOMEM;
@@ -330,7 +331,7 @@ int i915_mem_free(DRM_IOCTL_ARGS)
         if (!block)
                 return -EFAULT;
 
-        if (block->filp != filp)
+        if (block->file_priv != file_priv)
                 return -EPERM;
 
         mark_block(dev, block, 0);