From: Jan Kara <jack@suse.cz>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: dchinner@redhat.com, LKML <linux-kernel@vger.kernel.org>,
linux-fsdevel@vger.kernel.org, Jan Kara <jack@suse.cz>
Subject: [PATCH 08/27] mm: Make default vm_ops provide ->page_mkwrite handler
Date: Mon, 16 Apr 2012 18:13:46 +0200 [thread overview]
Message-ID: <1334592845-22862-9-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1334592845-22862-1-git-send-email-jack@suse.cz>
Make default vm_ops provide ->page_mkwrite handler. Currently it only updates
file's modification times and gets locked page but later it will also handle
filesystem freezing.
BugLink: https://bugs.launchpad.net/bugs/897421
Tested-by: Kamal Mostafa <kamal@canonical.com>
Tested-by: Peter M. Petrakis <peter.petrakis@canonical.com>
Tested-by: Dann Frazier <dann.frazier@canonical.com>
Tested-by: Massimo Morana <massimo.morana@canonical.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
include/linux/mm.h | 1 +
mm/filemap.c | 19 +++++++++++++++++++
mm/filemap_xip.c | 1 +
3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index d8738a4..9bec077 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1424,6 +1424,7 @@ extern void truncate_inode_pages_range(struct address_space *,
/* generic vm_area_ops exported for stackable file systems */
extern int filemap_fault(struct vm_area_struct *, struct vm_fault *);
+extern int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
/* mm/page-writeback.c */
int write_one_page(struct page *page, int wait);
diff --git a/mm/filemap.c b/mm/filemap.c
index 79c4b2b..aec7356 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1751,8 +1751,27 @@ page_not_uptodate:
}
EXPORT_SYMBOL(filemap_fault);
+int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+ struct page *page = vmf->page;
+ struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+ int ret = VM_FAULT_LOCKED;
+
+ file_update_time(vma->vm_file);
+ lock_page(page);
+ if (page->mapping != inode->i_mapping) {
+ unlock_page(page);
+ ret = VM_FAULT_NOPAGE;
+ goto out;
+ }
+out:
+ return ret;
+}
+EXPORT_SYMBOL(filemap_page_mkwrite);
+
const struct vm_operations_struct generic_file_vm_ops = {
.fault = filemap_fault,
+ .page_mkwrite = filemap_page_mkwrite,
};
/* This is used for a general mmap of a disk file */
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index a4eb311..591dba6 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -304,6 +304,7 @@ out:
static const struct vm_operations_struct xip_file_vm_ops = {
.fault = xip_file_fault,
+ .page_mkwrite = filemap_page_mkwrite,
};
int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
--
1.7.1
next prev parent reply other threads:[~2012-04-16 16:14 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 16:13 [Cluster-devel] [PATCH 00/19 v5] Fix filesystem freezing deadlocks Jan Kara
2012-04-16 16:13 ` [Ocfs2-devel] " Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` [PATCH 01/27] fb_defio: Push file_update_time() into fb_deferred_io_mkwrite() Jan Kara
2012-04-16 16:13 ` [PATCH 02/27] fs: Push file_update_time() into __block_page_mkwrite() Jan Kara
2012-04-16 16:13 ` [PATCH 03/27] ceph: Push file_update_time() into ceph_page_mkwrite() Jan Kara
2012-04-16 16:13 ` [PATCH 04/27] 9p: Push file_update_time() into v9fs_vm_page_mkwrite() Jan Kara
2012-04-16 16:13 ` [Cluster-devel] [PATCH 05/27] gfs2: Push file_update_time() into gfs2_page_mkwrite() Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` [PATCH 06/27] sysfs: Push file_update_time() into bin_page_mkwrite() Jan Kara
2012-04-16 16:13 ` [PATCH 07/27] mm: Update file times from fault path only if .page_mkwrite is not set Jan Kara
2012-04-16 16:13 ` Jan Kara [this message]
2012-04-16 16:13 ` [Ocfs2-devel] [PATCH 09/27] fs: Push mnt_want_write() outside of i_mutex Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-17 2:18 ` [Ocfs2-devel] " Joel Becker
2012-04-17 2:18 ` Joel Becker
2012-04-17 7:43 ` [Ocfs2-devel] " Jan Kara
2012-04-17 7:43 ` Jan Kara
2012-04-16 16:13 ` [PATCH 10/27] fat: " Jan Kara
2012-04-16 16:13 ` [PATCH 11/27] btrfs: " Jan Kara
2012-04-16 16:13 ` [PATCH 12/27] nfsd: " Jan Kara
2012-04-16 18:25 ` J. Bruce Fields
2012-04-17 8:17 ` Jan Kara
2012-04-16 16:13 ` [PATCH 13/27] fs: Improve filesystem freezing handling Jan Kara
2012-04-16 16:13 ` [PATCH 14/27] fs: Add freezing handling to mnt_want_write() / mnt_drop_write() Jan Kara
2012-04-16 16:13 ` [PATCH 15/27] fs: Skip atime update on frozen filesystem Jan Kara
2012-04-16 16:13 ` [PATCH 16/27] fs: Protect write paths by sb_start_write - sb_end_write Jan Kara
2012-04-16 16:13 ` [PATCH 17/27] ext4: Convert to new freezing mechanism Jan Kara
2012-04-16 16:13 ` [PATCH 18/27] xfs: Convert to new freezing code Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` [Ocfs2-devel] [PATCH 19/27] ocfs2: Convert to new freezing mechanism Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-17 2:19 ` [Ocfs2-devel] " Joel Becker
2012-04-17 2:19 ` Joel Becker
2012-04-17 7:44 ` [Ocfs2-devel] " Jan Kara
2012-04-17 7:44 ` Jan Kara
2012-04-16 16:13 ` [Cluster-devel] [PATCH 20/27] gfs2: " Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:13 ` Jan Kara
[not found] ` <1334592845-22862-1-git-send-email-jack-AlSwsSmVLrQ@public.gmane.org>
2012-04-16 16:13 ` [PATCH 21/27] fuse: " Jan Kara
2012-04-16 16:13 ` Jan Kara
2012-04-16 16:14 ` [PATCH 22/27] ntfs: " Jan Kara
2012-04-16 16:14 ` [PATCH 23/27] nilfs2: " Jan Kara
2012-04-16 16:14 ` [PATCH 24/27] btrfs: " Jan Kara
2012-04-16 16:14 ` [PATCH 25/27] fs: Remove old " Jan Kara
2012-04-16 16:14 ` [PATCH 26/27] fs: Refuse to freeze filesystem with open but unlinked files Jan Kara
2012-04-16 16:14 ` [PATCH 27/27] Documentation: Correct s_umount state for freeze_fs/unfreeze_fs Jan Kara
2012-04-16 16:16 ` [Cluster-devel] [PATCH 00/19 v5] Fix filesystem freezing deadlocks Jan Kara
2012-04-16 16:16 ` [Ocfs2-devel] " Jan Kara
2012-04-16 16:16 ` Jan Kara
2012-04-16 16:16 ` Jan Kara
2012-04-16 16:16 ` Jan Kara
2012-04-16 22:02 ` Andreas Dilger
2012-04-16 22:02 ` [Ocfs2-devel] " Andreas Dilger
2012-04-16 22:02 ` Andreas Dilger
2012-04-17 0:43 ` Dave Chinner
2012-04-17 0:43 ` [Ocfs2-devel] " Dave Chinner
2012-04-17 0:43 ` Dave Chinner
2012-04-17 0:43 ` Dave Chinner
2012-04-17 5:10 ` Andreas Dilger
2012-04-17 5:10 ` [Ocfs2-devel] " Andreas Dilger
2012-04-17 5:10 ` Andreas Dilger
2012-04-17 5:10 ` Andreas Dilger
2012-04-18 0:46 ` Chris Samuel
2012-04-18 0:46 ` Chris Samuel
2012-04-18 0:46 ` Chris Samuel
2012-04-18 0:46 ` Chris Samuel
2012-04-17 9:32 ` [Cluster-devel] " Jan Kara
2012-04-17 9:32 ` [Ocfs2-devel] " Jan Kara
2012-04-17 9:32 ` Jan Kara
2012-04-17 9:32 ` Jan Kara
2012-04-17 9:32 ` Jan Kara
2012-04-17 19:34 ` [Cluster-devel] " Joel Becker
2012-04-17 19:34 ` [Ocfs2-devel] " Joel Becker
2012-04-17 19:34 ` Joel Becker
2012-04-17 19:34 ` Joel Becker
2012-04-17 19:34 ` Joel Becker
-- strict thread matches above, loose matches on Subject: below --
2012-06-01 22:30 [Cluster-devel] [PATCH 00/27 v6] " Jan Kara
2012-06-01 22:30 ` [PATCH 08/27] mm: Make default vm_ops provide ->page_mkwrite handler Jan Kara
2012-06-12 14:20 [Cluster-devel] [PATCH 00/27 v7] Fix filesystem freezing deadlocks Jan Kara
2012-06-12 14:20 ` [PATCH 08/27] mm: Make default vm_ops provide ->page_mkwrite handler Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334592845-22862-9-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=dchinner@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.