summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_bmap_util.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-04-13 11:40:16 +1000
committerDave Chinner <david@fromorbit.com>2015-04-13 11:40:16 +1000
commit6a63ef064b2444883ce8b68b0779d0c739d27204 (patch)
tree03414baf93943556fc492e041a389b1c9a671b6a /fs/xfs/xfs_bmap_util.c
parenta448f8f1b744611fb1867ea811170cca2a9a6588 (diff)
parent21c3ea18819b5f650c75f59a0457415bc05d2b17 (diff)
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
Conflicts: fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
-rw-r--r--fs/xfs/xfs_bmap_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 1bd539321799..a52bbd3abc7d 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1383,7 +1383,7 @@ out:
* If we are shifting right, we will start with last extent inside file space
* and continue until we reach the block corresponding to offset.
*/
-int
+static int
xfs_shift_file_space(
struct xfs_inode *ip,
xfs_off_t offset,