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

Commit c2ec175c authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

mm: page_mkwrite change prototype to match fault 



Change the page_mkwrite prototype to take a struct vm_fault, and return
VM_FAULT_xxx flags.  There should be no functional change.

This makes it possible to return much more detailed error information to
the VM (and also can provide more information eg.  virtual_address to the
driver, which might be important in some special cases).

This is required for a subsequent fix.  And will also make it easier to
merge page_mkwrite() with fault() in future.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Artem Bityutskiy <dedekind@infradead.org>
Cc: Felix Blyakher <felixb@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c2fdf3a9

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ prototypes: 
	void (*open)(struct vm_area_struct*);

	void (*close)(struct vm_area_struct*);

	int (*fault)(struct vm_area_struct*, struct vm_fault *);

	int (*page_mkwrite)(struct vm_area_struct *, struct page *);

	int (*page_mkwrite)(struct vm_area_struct *, struct vm_fault *);

	int (*access)(struct vm_area_struct *, unsigned long, void*, int, int);



locking rules:

drivers/video/fb_defio.c

+2 −1
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_fsync); 


/* vm_ops->page_mkwrite handler */

static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,

				  struct page *page)

				  struct vm_fault *vmf)

{

	struct page *page = vmf->page;

	struct fb_info *info = vma->vm_private_data;

	struct fb_deferred_io *fbdefio = info->fbdefio;

	struct page *cur;

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2060,7 +2060,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset, 
unsigned long btrfs_force_ra(struct address_space *mapping,

			      struct file_ra_state *ra, struct file *file,

			      pgoff_t offset, pgoff_t last_index);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

int btrfs_readpage(struct file *file, struct page *page);

void btrfs_delete_inode(struct inode *inode);

void btrfs_put_inode(struct inode *inode);

fs/btrfs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -4292,8 +4292,9 @@ static void btrfs_invalidatepage(struct page *page, unsigned long offset) 
 * beyond EOF, then the page is guaranteed safe against truncation until we

 * unlock the page.

 */

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page)

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct page *page = vmf->page;

	struct inode *inode = fdentry(vma->vm_file)->d_inode;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
@@ -4362,6 +4363,8 @@ again: 
out_unlock:

	unlock_page(page);

out:

	if (ret)

		ret = VM_FAULT_SIGBUS;

	return ret;

}

fs/buffer.c

+5 −1
Original line number Diff line number Diff line
@@ -2313,9 +2313,10 @@ int block_commit_write(struct page *page, unsigned from, unsigned to) 
 * unlock the page.

 */

int

block_page_mkwrite(struct vm_area_struct *vma, struct page *page,

block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,

		   get_block_t get_block)

{

	struct page *page = vmf->page;

	struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

	unsigned long end;

	loff_t size;
@@ -2340,6 +2341,9 @@ block_page_mkwrite(struct vm_area_struct *vma, struct page *page, 
		ret = block_commit_write(page, 0, end);



out_unlock:

	if (ret)

		ret = VM_FAULT_SIGBUS;



	unlock_page(page);

	return ret;

}