summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.h
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-05-20 08:57:02 +1000
committerDave Chinner <david@fromorbit.com>2014-05-20 08:57:02 +1000
commitb70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch)
treecccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_inode.h
parent0d907a3bb4a77cffebebd17c323e898048301aa3 (diff)
parentab3e57b53f549ad51cbdf85e846ca4eaf0f3be30 (diff)
downloadop-kernel-dev-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip
op-kernel-dev-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.gz
Merge branch 'xfs-feature-bit-cleanup' into for-next
Conflicts: fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_inode.h')
-rw-r--r--fs/xfs/xfs_inode.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 13aea54..f72bffa 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -377,7 +377,6 @@ int xfs_dir_ialloc(struct xfs_trans **, struct xfs_inode *, umode_t,
struct xfs_inode **, int *);
int xfs_droplink(struct xfs_trans *, struct xfs_inode *);
int xfs_bumplink(struct xfs_trans *, struct xfs_inode *);
-void xfs_bump_ino_vers2(struct xfs_trans *, struct xfs_inode *);
/* from xfs_file.c */
int xfs_zero_eof(struct xfs_inode *, xfs_off_t, xfs_fsize_t);
OpenPOWER on IntegriCloud