diff options
author | Dave Chinner <david@fromorbit.com> | 2016-07-22 06:10:56 +0200 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2016-07-22 06:10:56 +0200 |
commit | f2bdfda9a1c668539bc85baf5625f6f14bc510b1 (patch) | |
tree | 18d704e07dda3a8842e84c645f4cbb5fb4859da1 /fs/xfs/xfs_file.c | |
parent | Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next (diff) | |
parent | xfs: remove EXPERIMENTAL tag from sparse inode feature (diff) | |
download | linux-f2bdfda9a1c668539bc85baf5625f6f14bc510b1.tar.xz linux-f2bdfda9a1c668539bc85baf5625f6f14bc510b1.zip |
Merge branch 'xfs-4.8-misc-fixes-4' into for-next
Diffstat (limited to 'fs/xfs/xfs_file.c')
-rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 0e7432558fc0..35df7576cbab 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -327,7 +327,7 @@ xfs_file_dio_aio_read( return ret; } -STATIC ssize_t +static noinline ssize_t xfs_file_dax_read( struct kiocb *iocb, struct iov_iter *to) @@ -706,7 +706,7 @@ out: return ret; } -STATIC ssize_t +static noinline ssize_t xfs_file_dax_write( struct kiocb *iocb, struct iov_iter *from) |