diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-20 00:57:02 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-20 00:57:02 +0200 |
| commit | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch) | |
| tree | cccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_inode.h | |
| parent | Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next (diff) | |
| parent | xfs: remove shared supberlock feature checking (diff) | |
| download | linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.xz linux-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip | |
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.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 13aea548206c..f72bffa67266 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); |