diff options
| -rw-r--r-- | fs/f2fs/acl.h | 2 | ||||
| -rw-r--r-- | fs/f2fs/data.c | 4 |
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 | ||
| 39 | extern struct posix_acl *f2fs_get_acl(struct inode *, int); | 39 | extern struct posix_acl *f2fs_get_acl(struct inode *, int); |
| 40 | extern int f2fs_set_acl(struct inode *inode, struct posix_acl *acl, int type); | 40 | extern int f2fs_set_acl(struct inode *, struct posix_acl *, int); |
| 41 | extern int f2fs_init_acl(struct inode *, struct inode *, struct page *, | 41 | extern 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 | } |
