diff options
| -rw-r--r-- | kernel/ksyms.c | 24 | ||||
| -rw-r--r-- | mm/filemap.c | 54 |
2 files changed, 52 insertions, 26 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 04bf7fbd6a1a..0f26ea5ecd68 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -182,14 +182,7 @@ EXPORT_SYMBOL(open_bdev_excl); EXPORT_SYMBOL(close_bdev_excl); EXPORT_SYMBOL(open_by_devnum); EXPORT_SYMBOL(blockdev_direct_IO); -EXPORT_SYMBOL(generic_file_read); -EXPORT_SYMBOL(generic_file_sendfile); -EXPORT_SYMBOL(do_generic_mapping_read); EXPORT_SYMBOL(file_ra_state_init); -EXPORT_SYMBOL(generic_file_write); -EXPORT_SYMBOL(generic_file_write_nolock); -EXPORT_SYMBOL(generic_file_mmap); -EXPORT_SYMBOL(generic_file_readonly_mmap); EXPORT_SYMBOL(generic_ro_fops); EXPORT_SYMBOL(get_unused_fd); EXPORT_SYMBOL(vfs_read); @@ -212,12 +205,6 @@ EXPORT_SYMBOL(no_llseek); EXPORT_SYMBOL(poll_initwait); EXPORT_SYMBOL(poll_freewait); EXPORT_SYMBOL(ROOT_DEV); -EXPORT_SYMBOL(find_get_page); -EXPORT_SYMBOL(find_lock_page); -EXPORT_SYMBOL(find_trylock_page); -EXPORT_SYMBOL(find_or_create_page); -EXPORT_SYMBOL(grab_cache_page_nowait); -EXPORT_SYMBOL(read_cache_page); EXPORT_SYMBOL(read_cache_pages); EXPORT_SYMBOL(mark_page_accessed); EXPORT_SYMBOL(vfs_readdir); @@ -242,13 +229,7 @@ EXPORT_SYMBOL(do_select); /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */ EXPORT_SYMBOL(default_llseek); EXPORT_SYMBOL(dentry_open); -#ifdef CONFIG_MMU -EXPORT_SYMBOL(filemap_nopage); -#endif -EXPORT_SYMBOL(filemap_fdatawrite); -EXPORT_SYMBOL(filemap_fdatawait); EXPORT_SYMBOL(lock_page); -EXPORT_SYMBOL(unlock_page); /* device registration */ EXPORT_SYMBOL(register_blkdev); @@ -264,9 +245,6 @@ EXPORT_SYMBOL(blkdev_get); EXPORT_SYMBOL(blkdev_put); EXPORT_SYMBOL(ioctl_by_bdev); EXPORT_SYMBOL(read_dev_sector); -EXPORT_SYMBOL_GPL(generic_file_direct_IO); -EXPORT_SYMBOL(generic_file_readv); -EXPORT_SYMBOL(generic_file_writev); EXPORT_SYMBOL(iov_shorten); EXPORT_SYMBOL_GPL(default_backing_dev_info); @@ -368,7 +346,6 @@ EXPORT_SYMBOL(get_jiffies_64); EXPORT_SYMBOL(loops_per_jiffy); #endif - /* misc */ EXPORT_SYMBOL(panic); EXPORT_SYMBOL(panic_notifier_list); @@ -431,7 +408,6 @@ EXPORT_SYMBOL(make_bad_inode); EXPORT_SYMBOL(is_bad_inode); EXPORT_SYMBOL(__inode_dir_notify); EXPORT_SYMBOL(generic_osync_inode); -EXPORT_SYMBOL(remove_suid); #ifdef CONFIG_UID16 EXPORT_SYMBOL(overflowuid); diff --git a/mm/filemap.c b/mm/filemap.c index ac6f0c62a1d6..6eb6c0b12c24 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -151,6 +151,8 @@ int filemap_fdatawrite(struct address_space *mapping) return __filemap_fdatawrite(mapping, WB_SYNC_ALL); } +EXPORT_SYMBOL(filemap_fdatawrite); + /* * This is a mostly non-blocking flush. Not suitable for data-integrity * purposes. @@ -216,6 +218,8 @@ restart: return ret; } +EXPORT_SYMBOL(filemap_fdatawait); + /* * This adds a page to the page cache, starting out as locked, unreferenced, * not uptodate and with no errors. @@ -253,6 +257,7 @@ int add_to_page_cache(struct page *page, struct address_space *mapping, } return error; } + EXPORT_SYMBOL(add_to_page_cache); int add_to_page_cache_lru(struct page *page, struct address_space *mapping, @@ -295,6 +300,7 @@ void wait_on_page_bit(struct page *page, int bit_nr) } while (test_bit(bit_nr, &page->flags)); finish_wait(waitqueue, &wait); } + EXPORT_SYMBOL(wait_on_page_bit); /** @@ -323,6 +329,8 @@ void unlock_page(struct page *page) wake_up_all(waitqueue); } +EXPORT_SYMBOL(unlock_page); + /* * End writeback against a page. */ @@ -339,6 +347,7 @@ void end_page_writeback(struct page *page) if (waitqueue_active(waitqueue)) wake_up_all(waitqueue); } + EXPORT_SYMBOL(end_page_writeback); /* @@ -363,6 +372,7 @@ void __lock_page(struct page *page) } finish_wait(wqh, &wait); } + EXPORT_SYMBOL(__lock_page); /* @@ -385,6 +395,8 @@ struct page * find_get_page(struct address_space *mapping, unsigned long offset) return page; } +EXPORT_SYMBOL(find_get_page); + /* * Same as above, but trylock it instead of incrementing the count. */ @@ -400,6 +412,8 @@ struct page *find_trylock_page(struct address_space *mapping, unsigned long offs return page; } +EXPORT_SYMBOL(find_trylock_page); + /** * find_lock_page - locate, pin and lock a pagecache page * @@ -438,6 +452,8 @@ repeat: return page; } +EXPORT_SYMBOL(find_lock_page); + /** * find_or_create_page - locate or add a pagecache page * @@ -482,6 +498,8 @@ repeat: return page; } +EXPORT_SYMBOL(find_or_create_page); + /** * find_get_pages - gang pagecache lookup * @mapping: The address_space to search @@ -543,6 +561,8 @@ grab_cache_page_nowait(struct address_space *mapping, unsigned long index) return page; } +EXPORT_SYMBOL(grab_cache_page_nowait); + /* * This is a generic file read routine, and uses the * inode->i_op->readpage() function for the actual low-level @@ -699,6 +719,8 @@ no_cached_page: update_atime(inode); } +EXPORT_SYMBOL(do_generic_mapping_read); + int file_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset, unsigned long size) { @@ -816,6 +838,8 @@ out: return retval; } +EXPORT_SYMBOL(__generic_file_aio_read); + ssize_t generic_file_aio_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos) { @@ -824,8 +848,8 @@ generic_file_aio_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t BUG_ON(iocb->ki_pos != pos); return __generic_file_aio_read(iocb, &local_iov, 1, &iocb->ki_pos); } + EXPORT_SYMBOL(generic_file_aio_read); -EXPORT_SYMBOL(__generic_file_aio_read); ssize_t generic_file_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos) @@ -841,6 +865,8 @@ generic_file_read(struct file *filp, char __user *buf, size_t count, loff_t *ppo return ret; } +EXPORT_SYMBOL(generic_file_read); + int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size) { ssize_t written; @@ -880,6 +906,8 @@ ssize_t generic_file_sendfile(struct file *in_file, loff_t *ppos, return desc.error; } +EXPORT_SYMBOL(generic_file_sendfile); + static ssize_t do_readahead(struct address_space *mapping, struct file *filp, unsigned long index, unsigned long nr) @@ -1126,6 +1154,8 @@ page_not_uptodate: return NULL; } +EXPORT_SYMBOL(filemap_nopage); + static struct page * filemap_getpage(struct file *file, unsigned long pgoff, int nonblock) { @@ -1330,6 +1360,9 @@ int generic_file_readonly_mmap(struct file * file, struct vm_area_struct * vma) } #endif /* CONFIG_MMU */ +EXPORT_SYMBOL(generic_file_mmap); +EXPORT_SYMBOL(generic_file_readonly_mmap); + static inline struct page *__read_cache_page(struct address_space *mapping, unsigned long index, int (*filler)(void *,struct page*), @@ -1406,6 +1439,8 @@ retry: return page; } +EXPORT_SYMBOL(read_cache_page); + /* * If the page was newly created, increment its refcount and add it to the * caller's lru-buffering pagevec. This function is specifically for @@ -1456,6 +1491,8 @@ void remove_suid(struct dentry *dentry) } } +EXPORT_SYMBOL(remove_suid); + /* * Copy as much as we can into the page and return the number of bytes which * were sucessfully copied. If a fault is encountered then clear the page @@ -1638,6 +1675,7 @@ inline int generic_write_checks(struct inode *inode, } return 0; } + EXPORT_SYMBOL(generic_write_checks); /* @@ -1832,6 +1870,8 @@ out: return err; } +EXPORT_SYMBOL(generic_file_aio_write_nolock); + ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov, unsigned long nr_segs, loff_t *ppos) @@ -1846,6 +1886,8 @@ generic_file_write_nolock(struct file *file, const struct iovec *iov, return ret; } +EXPORT_SYMBOL(generic_file_write_nolock); + ssize_t generic_file_aio_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos) { @@ -1863,8 +1905,8 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const char __user *buf, return err; } + EXPORT_SYMBOL(generic_file_aio_write); -EXPORT_SYMBOL(generic_file_aio_write_nolock); ssize_t generic_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) @@ -1880,6 +1922,8 @@ ssize_t generic_file_write(struct file *file, const char __user *buf, return err; } +EXPORT_SYMBOL(generic_file_write); + ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, unsigned long nr_segs, loff_t *ppos) { @@ -1893,6 +1937,8 @@ ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, return ret; } +EXPORT_SYMBOL(generic_file_readv); + ssize_t generic_file_writev(struct file *file, const struct iovec *iov, unsigned long nr_segs, loff_t * ppos) { @@ -1905,6 +1951,8 @@ ssize_t generic_file_writev(struct file *file, const struct iovec *iov, return ret; } +EXPORT_SYMBOL(generic_file_writev); + ssize_t generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs) @@ -1927,3 +1975,5 @@ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, out: return retval; } + +EXPORT_SYMBOL_GPL(generic_file_direct_IO); |