mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage
Mostly direct substitution with occasional adjustment or removing outdated comments. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
09cbfeaf1a
commit
ea1754a084
65 changed files with 120 additions and 135 deletions
|
|
@ -135,7 +135,7 @@ struct bdi_writeback {
|
|||
|
||||
struct backing_dev_info {
|
||||
struct list_head bdi_list;
|
||||
unsigned long ra_pages; /* max readahead in PAGE_CACHE_SIZE units */
|
||||
unsigned long ra_pages; /* max readahead in PAGE_SIZE units */
|
||||
unsigned int capabilities; /* Device capabilities */
|
||||
congested_fn *congested_fn; /* Function pointer if device is md/dm */
|
||||
void *congested_data; /* Pointer to aux data for congested func */
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ void do_set_pte(struct vm_area_struct *vma, unsigned long address,
|
|||
*
|
||||
* A page may belong to an inode's memory mapping. In this case, page->mapping
|
||||
* is the pointer to the inode, and page->index is the file offset of the page,
|
||||
* in units of PAGE_CACHE_SIZE.
|
||||
* in units of PAGE_SIZE.
|
||||
*
|
||||
* If pagecache pages are not associated with an inode, they are said to be
|
||||
* anonymous pages. These may become associated with the swapcache, and in that
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ struct vm_area_struct {
|
|||
|
||||
/* Information about our backing store: */
|
||||
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
|
||||
units, *not* PAGE_CACHE_SIZE */
|
||||
units */
|
||||
struct file * vm_file; /* File we map to (can be NULL). */
|
||||
void * vm_private_data; /* was vm_pte (shared mem) */
|
||||
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ struct nfs_page {
|
|||
struct page *wb_page; /* page to read in/write out */
|
||||
struct nfs_open_context *wb_context; /* File state context info */
|
||||
struct nfs_lock_context *wb_lock_context; /* lock context info */
|
||||
pgoff_t wb_index; /* Offset >> PAGE_CACHE_SHIFT */
|
||||
unsigned int wb_offset, /* Offset & ~PAGE_CACHE_MASK */
|
||||
pgoff_t wb_index; /* Offset >> PAGE_SHIFT */
|
||||
unsigned int wb_offset, /* Offset & ~PAGE_MASK */
|
||||
wb_pgbase, /* Start of page data */
|
||||
wb_bytes; /* Length of request */
|
||||
struct kref wb_kref; /* reference count */
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen)
|
|||
{
|
||||
unsigned len = le16_to_cpu(dlen);
|
||||
|
||||
#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536)
|
||||
#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)
|
||||
if (len == NILFS_MAX_REC_LEN)
|
||||
return 1 << 16;
|
||||
#endif
|
||||
|
|
@ -340,7 +340,7 @@ static inline unsigned nilfs_rec_len_from_disk(__le16 dlen)
|
|||
|
||||
static inline __le16 nilfs_rec_len_to_disk(unsigned len)
|
||||
{
|
||||
#if !defined(__KERNEL__) || (PAGE_CACHE_SIZE >= 65536)
|
||||
#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)
|
||||
if (len == (1 << 16))
|
||||
return cpu_to_le16(NILFS_MAX_REC_LEN);
|
||||
else if (len > (1 << 16))
|
||||
|
|
|
|||
|
|
@ -535,8 +535,7 @@ extern void add_page_wait_queue(struct page *page, wait_queue_t *waiter);
|
|||
/*
|
||||
* Fault a userspace page into pagetables. Return non-zero on a fault.
|
||||
*
|
||||
* This assumes that two userspace pages are always sufficient. That's
|
||||
* not true if PAGE_CACHE_SIZE > PAGE_SIZE.
|
||||
* This assumes that two userspace pages are always sufficient.
|
||||
*/
|
||||
static inline int fault_in_pages_writeable(char __user *uaddr, int size)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ static inline void svc_get(struct svc_serv *serv)
|
|||
*
|
||||
* These happen to all be powers of 2, which is not strictly
|
||||
* necessary but helps enforce the real limitation, which is
|
||||
* that they should be multiples of PAGE_CACHE_SIZE.
|
||||
* that they should be multiples of PAGE_SIZE.
|
||||
*
|
||||
* For UDP transports, a block plus NFS,RPC, and UDP headers
|
||||
* has to fit into the IP datagram limit of 64K. The largest
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ struct backing_dev_info;
|
|||
#define si_swapinfo(val) \
|
||||
do { (val)->freeswap = (val)->totalswap = 0; } while (0)
|
||||
/* only sparc can not include linux/pagemap.h in this file
|
||||
* so leave page_cache_release and release_pages undeclared... */
|
||||
* so leave put_page and release_pages undeclared... */
|
||||
#define free_page_and_swap_cache(page) \
|
||||
put_page(page)
|
||||
#define free_pages_and_swap_cache(pages, nr) \
|
||||
|
|
|
|||
Loading…
Reference in a new issue