diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-13 20:15:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-13 20:15:49 -0800 |
| commit | 7c5cac1bc7170bfc726a69eb64947c55658d16ad (patch) | |
| tree | af8a13c25b9c8298826202ac233bfd78ec34cc8b /fs/xfs/xfs_inode.h | |
| parent | 4e746cf4f721d6397bace501f5feadb46eec1314 (diff) | |
| parent | b7e0b6ff54dd92febbb1914ab93cd6a21622e169 (diff) | |
| download | op-kernel-dev-7c5cac1bc7170bfc726a69eb64947c55658d16ad.zip op-kernel-dev-7c5cac1bc7170bfc726a69eb64947c55658d16ad.tar.gz | |
Merge tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
"Here are a few more bug fixes & cleanups for 4.15-rc4:
- clean up duplicate includes
- remove ancient 'no-alloc' crap code that occasionally caused hard
fs shutdowns due to lack of proper space reservations
- fix regression in FIEMAP behavior when reporting xattr extents"
* tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: make iomap_begin functions trim iomaps consistently
xfs: remove "no-allocation" reservations for file creations
fs: xfs: remove duplicate includes
Diffstat (limited to 'fs/xfs/xfs_inode.h')
| -rw-r--r-- | fs/xfs/xfs_inode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index cc13c37..b2136af 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -428,7 +428,7 @@ xfs_extlen_t xfs_get_extsz_hint(struct xfs_inode *ip); xfs_extlen_t xfs_get_cowextsz_hint(struct xfs_inode *ip); int xfs_dir_ialloc(struct xfs_trans **, struct xfs_inode *, umode_t, - xfs_nlink_t, dev_t, prid_t, int, + xfs_nlink_t, dev_t, prid_t, struct xfs_inode **, int *); /* from xfs_file.c */ |
