Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 252aa6f5be64c90c67b9f066ccff880f6b487d32

Authored by Rafael Aquini
Committed by Linus Torvalds
1 parent 78bd52097d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm: redefine address_space.assoc_mapping 

Overhaul struct address_space.assoc_mapping renaming it to
address_space.private_data and its type is redefined to void*.  By this
approach we consistently name the .private_* elements from struct
address_space as well as allow extended usage for address_space
association with other data structures through ->private_data.

Also, all users of old ->assoc_mapping element are converted to reflect
its new name and type change (->private_data).

Signed-off-by: Rafael Aquini <aquini@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -555,7 +555,7 @@
555 555 */
556 556 int sync_mapping_buffers(struct address_space *mapping)
557 557 {
558   - struct address_space *buffer_mapping = mapping->assoc_mapping;
  558 + struct address_space *buffer_mapping = mapping->private_data;
559 559  
560 560 if (buffer_mapping == NULL || list_empty(&mapping->private_list))
561 561 return 0;
562 562  
... ... @@ -588,10 +588,10 @@
588 588 struct address_space *buffer_mapping = bh->b_page->mapping;
589 589  
590 590 mark_buffer_dirty(bh);
591   - if (!mapping->assoc_mapping) {
592   - mapping->assoc_mapping = buffer_mapping;
  591 + if (!mapping->private_data) {
  592 + mapping->private_data = buffer_mapping;
593 593 } else {
594   - BUG_ON(mapping->assoc_mapping != buffer_mapping);
  594 + BUG_ON(mapping->private_data != buffer_mapping);
595 595 }
596 596 if (!bh->b_assoc_map) {
597 597 spin_lock(&buffer_mapping->private_lock);
... ... @@ -788,7 +788,7 @@
788 788 if (inode_has_buffers(inode)) {
789 789 struct address_space *mapping = &inode->i_data;
790 790 struct list_head *list = &mapping->private_list;
791   - struct address_space *buffer_mapping = mapping->assoc_mapping;
  791 + struct address_space *buffer_mapping = mapping->private_data;
792 792  
793 793 spin_lock(&buffer_mapping->private_lock);
794 794 while (!list_empty(list))
... ... @@ -811,7 +811,7 @@
811 811 if (inode_has_buffers(inode)) {
812 812 struct address_space *mapping = &inode->i_data;
813 813 struct list_head *list = &mapping->private_list;
814   - struct address_space *buffer_mapping = mapping->assoc_mapping;
  814 + struct address_space *buffer_mapping = mapping->private_data;
815 815  
816 816 spin_lock(&buffer_mapping->private_lock);
817 817 while (!list_empty(list)) {
... ... @@ -768,7 +768,7 @@
768 768 mapping->host = s->s_bdev->bd_inode;
769 769 mapping->flags = 0;
770 770 mapping_set_gfp_mask(mapping, GFP_NOFS);
771   - mapping->assoc_mapping = NULL;
  771 + mapping->private_data = NULL;
772 772 mapping->backing_dev_info = s->s_bdi;
773 773 mapping->writeback_index = 0;
774 774 }
... ... @@ -165,7 +165,7 @@
165 165 mapping->host = inode;
166 166 mapping->flags = 0;
167 167 mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE);
168   - mapping->assoc_mapping = NULL;
  168 + mapping->private_data = NULL;
169 169 mapping->backing_dev_info = &default_backing_dev_info;
170 170 mapping->writeback_index = 0;
171 171  
... ... @@ -431,7 +431,7 @@
431 431 mapping->host = inode;
432 432 mapping->flags = 0;
433 433 mapping_set_gfp_mask(mapping, GFP_NOFS);
434   - mapping->assoc_mapping = NULL;
  434 + mapping->private_data = NULL;
435 435 mapping->backing_dev_info = bdi;
436 436 mapping->a_ops = &empty_aops;
437 437 }
... ... @@ -418,7 +418,7 @@
418 418 struct backing_dev_info *backing_dev_info; /* device readahead, etc */
419 419 spinlock_t private_lock; /* for use by the address_space */
420 420 struct list_head private_list; /* ditto */
421   - struct address_space *assoc_mapping; /* ditto */
  421 + void *private_data; /* ditto */
422 422 } __attribute__((aligned(sizeof(long))));
423 423 /*
424 424 * On most architectures that alignment is already the case; but