Merge tag 'v3.13' into stable-3.14

Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.

1 files changed, 12 insertions, 17 deletions

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 941f9b9ca3a5..aa3438c571fa 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -68,9 +68,6 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,
                                         struct buffer_head *bh_result)
 {
         struct f2fs_inode_info *fi = F2FS_I(inode);
-#ifdef CONFIG_F2FS_STAT_FS
-        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
-#endif
         pgoff_t start_fofs, end_fofs;
         block_t start_blkaddr;
 
@@ -80,9 +77,8 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,
                 return 0;
         }
 
-#ifdef CONFIG_F2FS_STAT_FS
-        sbi->total_hit_ext++;
-#endif
+        stat_inc_total_hit(inode->i_sb);
+
         start_fofs = fi->ext.fofs;
         end_fofs = fi->ext.fofs + fi->ext.len - 1;
         start_blkaddr = fi->ext.blk_addr;
@@ -100,9 +96,7 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs,
                 else
                         bh_result->b_size = UINT_MAX;
 
-#ifdef CONFIG_F2FS_STAT_FS
-                sbi->read_hit_ext++;
-#endif
+                stat_inc_read_hit(inode->i_sb);
                 read_unlock(&fi->ext.ext_lock);
                 return 1;
         }
@@ -116,7 +110,7 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn)
         pgoff_t fofs, start_fofs, end_fofs;
         block_t start_blkaddr, end_blkaddr;
 
-        BUG_ON(blk_addr == NEW_ADDR);
+        f2fs_bug_on(blk_addr == NEW_ADDR);
         fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +
                                                         dn->ofs_in_node;
 
@@ -442,7 +436,7 @@ static int get_data_block_ro(struct inode *inode, sector_t iblock,
         }
 
         /* It does not support data allocation */
-        BUG_ON(create);
+        f2fs_bug_on(create);
 
         if (dn.data_blkaddr != NEW_ADDR && dn.data_blkaddr != NULL_ADDR) {
                 int i;
@@ -560,9 +554,9 @@ write:
                 inode_dec_dirty_dents(inode);
                 err = do_write_data_page(page);
         } else {
-                int ilock = mutex_lock_op(sbi);
+                f2fs_lock_op(sbi);
                 err = do_write_data_page(page);
-                mutex_unlock_op(sbi, ilock);
+                f2fs_unlock_op(sbi);
                 need_balance_fs = true;
         }
         if (err == -ENOENT)
@@ -641,7 +635,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
         pgoff_t index = ((unsigned long long) pos) >> PAGE_CACHE_SHIFT;
         struct dnode_of_data dn;
         int err = 0;
-        int ilock;
 
         f2fs_balance_fs(sbi);
 repeat:
@@ -650,7 +643,7 @@ repeat:
                 return -ENOMEM;
         *pagep = page;
 
-        ilock = mutex_lock_op(sbi);
+        f2fs_lock_op(sbi);
 
         set_new_dnode(&dn, inode, NULL, NULL, 0);
         err = get_dnode_of_data(&dn, index, ALLOC_NODE);
@@ -664,7 +657,7 @@ repeat:
         if (err)
                 goto err;
 
-        mutex_unlock_op(sbi, ilock);
+        f2fs_unlock_op(sbi);
 
         if ((len == PAGE_CACHE_SIZE) || PageUptodate(page))
                 return 0;
@@ -700,7 +693,7 @@ out:
         return 0;
 
 err:
-        mutex_unlock_op(sbi, ilock);
+        f2fs_unlock_op(sbi);
         f2fs_put_page(page, 1);
         return err;
 }
@@ -763,6 +756,8 @@ static int f2fs_set_data_page_dirty(struct page *page)
         struct address_space *mapping = page->mapping;
         struct inode *inode = mapping->host;
 
+        trace_f2fs_set_page_dirty(page, DATA);
+
         SetPageUptodate(page);
         if (!PageDirty(page)) {
                 __set_page_dirty_nobuffers(page);