summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_file.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-07-22 14:10:56 +1000
committerDave Chinner <david@fromorbit.com>2016-07-22 14:10:56 +1000
commitf2bdfda9a1c668539bc85baf5625f6f14bc510b1 (patch)
tree18d704e07dda3a8842e84c645f4cbb5fb4859da1 /fs/xfs/xfs_file.c
parentdc4113d2433e01b06685743552d99573c9d470f3 (diff)
parent72ccbbe154fc307c98153725822be515fc0326d3 (diff)
downloadlinux-f2bdfda9a1c668539bc85baf5625f6f14bc510b1.tar.bz2
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.c4
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)