f2fs: add tracepoint for f2fs_vm_page_mkwrite()

[sfrench/cifs-2.6.git] / fs / f2fs / file.c

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 3c7e6bfc1265876b3ae7e354c36f0537146fc1b3..60290940018d4e7763ef9c4f66d82b90dde4549a 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -46,7 +46,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)
                f2fs_update_iostat(F2FS_I_SB(inode), inode,
                                        APP_MAPPED_READ_IO, F2FS_BLKSIZE);
 
-       trace_f2fs_filemap_fault(inode, vmf->pgoff, (unsigned long)ret);
+       trace_f2fs_filemap_fault(inode, vmf->pgoff, vmf->vma->vm_flags, ret);
 
        return ret;
 }
@@ -59,26 +59,29 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
        struct dnode_of_data dn;
        bool need_alloc = true;
        int err = 0;
+       vm_fault_t ret;
 
        if (unlikely(IS_IMMUTABLE(inode)))
                return VM_FAULT_SIGBUS;
 
-       if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED))
-               return VM_FAULT_SIGBUS;
+       if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
+               err = -EIO;
+               goto out;
+       }
 
        if (unlikely(f2fs_cp_error(sbi))) {
                err = -EIO;
-               goto err;
+               goto out;
        }
 
        if (!f2fs_is_checkpoint_ready(sbi)) {
                err = -ENOSPC;
-               goto err;
+               goto out;
        }
 
        err = f2fs_convert_inline_inode(inode);
        if (err)
-               goto err;
+               goto out;
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION
        if (f2fs_compressed_file(inode)) {
@@ -86,7 +89,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
 
                if (ret < 0) {
                        err = ret;
-                       goto err;
+                       goto out;
                } else if (ret) {
                        need_alloc = false;
                }
@@ -153,13 +156,15 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
        f2fs_update_iostat(sbi, inode, APP_MAPPED_IO, F2FS_BLKSIZE);
        f2fs_update_time(sbi, REQ_TIME);
 
-       trace_f2fs_vm_page_mkwrite(page, DATA);
 out_sem:
        filemap_invalidate_unlock_shared(inode->i_mapping);
 
        sb_end_pagefault(inode->i_sb);
-err:
-       return vmf_fs_error(err);
+out:
+       ret = vmf_fs_error(err);
+
+       trace_f2fs_vm_page_mkwrite(inode, page->index, vmf->vma->vm_flags, ret);
+       return ret;
 }
 
 static const struct vm_operations_struct f2fs_file_vm_ops = {