Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ce7852c authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] mm/filemap.c: make two functions static 



With Nick Piggin <npiggin@suse.de>

Give some things static scope.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dd81eca8

include/linux/fs.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -1509,8 +1509,6 @@ extern void do_generic_mapping_read(struct address_space *mapping, 
				    loff_t *, read_descriptor_t *, read_actor_t);

				    loff_t *, read_descriptor_t *, read_actor_t);

extern void

extern void

file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);

file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);

extern ssize_t generic_file_direct_IO(int rw, struct kiocb *iocb,

	const struct iovec *iov, loff_t offset, unsigned long nr_segs);

extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 

extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 

	unsigned long nr_segs, loff_t *ppos);

	unsigned long nr_segs, loff_t *ppos);

ssize_t generic_file_writev(struct file *filp, const struct iovec *iov, 

ssize_t generic_file_writev(struct file *filp, const struct iovec *iov,

include/linux/writeback.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -109,8 +109,6 @@ int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0); 
int do_writepages(struct address_space *mapping, struct writeback_control *wbc);

int do_writepages(struct address_space *mapping, struct writeback_control *wbc);

int sync_page_range(struct inode *inode, struct address_space *mapping,

int sync_page_range(struct inode *inode, struct address_space *mapping,

			loff_t pos, size_t count);

			loff_t pos, size_t count);

int sync_page_range_nolock(struct inode *inode, struct address_space

		*mapping, loff_t pos, size_t count);





/* pdflush.c */

/* pdflush.c */

extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl

extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl

mm/filemap.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -37,6 +37,10 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <asm/mman.h>

#include <asm/mman.h>





static ssize_t

generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,

	loff_t offset, unsigned long nr_segs);



/*

/*

 * Shared mappings implemented 30.11.1994. It's not fully working yet,

 * Shared mappings implemented 30.11.1994. It's not fully working yet,

 * though.

 * though.
@@ -301,7 +305,8 @@ EXPORT_SYMBOL(sync_page_range); 
 * as it forces O_SYNC writers to different parts of the same file

 * as it forces O_SYNC writers to different parts of the same file

 * to be serialised right until io completion.

 * to be serialised right until io completion.

 */

 */

int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,

static int sync_page_range_nolock(struct inode *inode,

				  struct address_space *mapping,

				  loff_t pos, size_t count)

				  loff_t pos, size_t count)

{

{

	pgoff_t start = pos >> PAGE_CACHE_SHIFT;

	pgoff_t start = pos >> PAGE_CACHE_SHIFT;
@@ -317,7 +322,6 @@ int sync_page_range_nolock(struct inode *inode, struct address_space *mapping, 
		ret = wait_on_page_writeback_range(mapping, start, end);

		ret = wait_on_page_writeback_range(mapping, start, end);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL(sync_page_range_nolock);





/**

/**

 * filemap_fdatawait - walk the list of under-writeback pages of the given

 * filemap_fdatawait - walk the list of under-writeback pages of the given
@@ -2008,7 +2012,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov, 
}

}

EXPORT_SYMBOL(generic_file_buffered_write);

EXPORT_SYMBOL(generic_file_buffered_write);





ssize_t

static ssize_t

__generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,

__generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,

				unsigned long nr_segs, loff_t *ppos)

				unsigned long nr_segs, loff_t *ppos)

{

{
@@ -2108,7 +2112,7 @@ generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov, 
	return ret;

	return ret;

}

}





ssize_t

static ssize_t

__generic_file_write_nolock(struct file *file, const struct iovec *iov,

__generic_file_write_nolock(struct file *file, const struct iovec *iov,

				unsigned long nr_segs, loff_t *ppos)

				unsigned long nr_segs, loff_t *ppos)

{

{
@@ -2229,7 +2233,7 @@ EXPORT_SYMBOL(generic_file_writev); 
 * Called under i_sem for writes to S_ISREG files.   Returns -EIO if something

 * Called under i_sem for writes to S_ISREG files.   Returns -EIO if something

 * went wrong during pagecache shootdown.

 * went wrong during pagecache shootdown.

 */

 */

ssize_t

static ssize_t

generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,

generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,

	loff_t offset, unsigned long nr_segs)

	loff_t offset, unsigned long nr_segs)

{

{
@@ -2264,4 +2268,3 @@ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, 
	}

	}

	return retval;

	return retval;

}
 
}
 
EXPORT_SYMBOL_GPL(generic_file_direct_IO);

mm/memory.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2225,7 +2225,7 @@ void update_mem_hiwater(struct task_struct *tsk) 
#if !defined(__HAVE_ARCH_GATE_AREA)

#if !defined(__HAVE_ARCH_GATE_AREA)





#if defined(AT_SYSINFO_EHDR)

#if defined(AT_SYSINFO_EHDR)

struct vm_area_struct gate_vma;

static struct vm_area_struct gate_vma;





static int __init gate_vma_init(void)

static int __init gate_vma_init(void)

{

{