aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-07-22 18:25:47 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2016-07-25 15:58:12 -0400
commit5302fb000def84100740a84d7f176c0e167b2141 (patch)
tree1b47305282e653860f64f849c0583fdc1d952c77
parentfe94793e555f650fab656649521fc38aaab4874e (diff)
f2fs: clean up coding style and redundancy
This patch includes minor clean-ups. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/acl.h2
-rw-r--r--fs/f2fs/data.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/acl.h b/fs/f2fs/acl.h
index 997ca8edb6cb..b2334d11dae8 100644
--- a/fs/f2fs/acl.h
+++ b/fs/f2fs/acl.h
@@ -37,7 +37,7 @@ struct f2fs_acl_header {
37#ifdef CONFIG_F2FS_FS_POSIX_ACL 37#ifdef CONFIG_F2FS_FS_POSIX_ACL
38 38
39extern struct posix_acl *f2fs_get_acl(struct inode *, int); 39extern struct posix_acl *f2fs_get_acl(struct inode *, int);
40extern int f2fs_set_acl(struct inode *inode, struct posix_acl *acl, int type); 40extern int f2fs_set_acl(struct inode *, struct posix_acl *, int);
41extern int f2fs_init_acl(struct inode *, struct inode *, struct page *, 41extern int f2fs_init_acl(struct inode *, struct inode *, struct page *,
42 struct page *); 42 struct page *);
43#else 43#else
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 87a458fb8afe..614154f9bb35 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1731,7 +1731,7 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
1731 if (test_opt(F2FS_I_SB(inode), LFS)) 1731 if (test_opt(F2FS_I_SB(inode), LFS))
1732 return 0; 1732 return 0;
1733 1733
1734 trace_f2fs_direct_IO_enter(inode, offset, count, iov_iter_rw(iter)); 1734 trace_f2fs_direct_IO_enter(inode, offset, count, rw);
1735 1735
1736 down_read(&F2FS_I(inode)->dio_rwsem[rw]); 1736 down_read(&F2FS_I(inode)->dio_rwsem[rw]);
1737 err = blockdev_direct_IO(iocb, inode, iter, get_data_block_dio); 1737 err = blockdev_direct_IO(iocb, inode, iter, get_data_block_dio);
@@ -1744,7 +1744,7 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
1744 f2fs_write_failed(mapping, offset + count); 1744 f2fs_write_failed(mapping, offset + count);
1745 } 1745 }
1746 1746
1747 trace_f2fs_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), err); 1747 trace_f2fs_direct_IO_exit(inode, offset, count, rw, err);
1748 1748
1749 return err; 1749 return err;
1750} 1750}