Skip to content

Commit c05e14f

Browse files
committed
Merge tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs
Pull xfs update from Dave Chinner: "There's relatively little change in this update; it is mainly bug fixes, cleanups and more of the on-going libxfs restructuring and on-disk format header consolidation work. Details: - more on-disk format header consolidation - move some structures shared with userspace to libxfs - new per-mount workqueue to fix for deadlocks between nested loop mounted filesystems - various bug fixes for ENOSPC, stats, quota off and preallocation - a bunch of compiler warning fixes for set-but-unused variables - various code cleanups" * tag 'xfs-for-linus-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (24 commits) xfs: split metadata and log buffer completion to separate workqueues xfs: fix set-but-unused warnings xfs: move type conversion functions to xfs_dir.h xfs: move ftype conversion functions to libxfs xfs: lobotomise xfs_trans_read_buf_map() xfs: active inodes stat is broken xfs: cleanup xfs_bmse_merge returns xfs: cleanup xfs_bmse_shift_one goto mess xfs: fix premature enospc on inode allocation xfs: overflow in xfs_iomap_eof_align_last_fsb xfs: fix simple_return.cocci warning in xfs_bmse_shift_one xfs: fix simple_return.cocci warning in xfs_file_readdir libxfs: fix simple_return.cocci warnings xfs: remove unnecessary null checks xfs: merge xfs_inum.h into xfs_format.h xfs: move most of xfs_sb.h to xfs_format.h xfs: merge xfs_ag.h into xfs_format.h xfs: move acl structures to xfs_format.h xfs: merge xfs_dinode.h into xfs_format.h xfs: catch invalid negative blknos in _xfs_buf_find() ...
2 parents 9bfccec + 6044e43 commit c05e14f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1467
-1835
lines changed

fs/xfs/libxfs/xfs_ag.h

Lines changed: 0 additions & 281 deletions
This file was deleted.

fs/xfs/libxfs/xfs_alloc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "xfs_trans_resv.h"
2424
#include "xfs_bit.h"
2525
#include "xfs_sb.h"
26-
#include "xfs_ag.h"
2726
#include "xfs_mount.h"
2827
#include "xfs_inode.h"
2928
#include "xfs_btree.h"

fs/xfs/libxfs/xfs_alloc.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,7 @@ xfs_alloc_get_rec(
231231
xfs_extlen_t *len, /* output: length of extent */
232232
int *stat); /* output: success/failure */
233233

234+
int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,
235+
xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
236+
234237
#endif /* __XFS_ALLOC_H__ */

fs/xfs/libxfs/xfs_alloc_btree.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "xfs_log_format.h"
2323
#include "xfs_trans_resv.h"
2424
#include "xfs_sb.h"
25-
#include "xfs_ag.h"
2625
#include "xfs_mount.h"
2726
#include "xfs_btree.h"
2827
#include "xfs_alloc_btree.h"

fs/xfs/libxfs/xfs_attr.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "xfs_log_format.h"
2323
#include "xfs_trans_resv.h"
2424
#include "xfs_bit.h"
25-
#include "xfs_sb.h"
26-
#include "xfs_ag.h"
2725
#include "xfs_mount.h"
2826
#include "xfs_da_format.h"
2927
#include "xfs_da_btree.h"
@@ -42,7 +40,6 @@
4240
#include "xfs_quota.h"
4341
#include "xfs_trans_space.h"
4442
#include "xfs_trace.h"
45-
#include "xfs_dinode.h"
4643

4744
/*
4845
* xfs_attr.c

fs/xfs/libxfs/xfs_attr_leaf.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "xfs_trans_resv.h"
2525
#include "xfs_bit.h"
2626
#include "xfs_sb.h"
27-
#include "xfs_ag.h"
2827
#include "xfs_mount.h"
2928
#include "xfs_da_format.h"
3029
#include "xfs_da_btree.h"
@@ -41,7 +40,6 @@
4140
#include "xfs_trace.h"
4241
#include "xfs_buf_item.h"
4342
#include "xfs_cksum.h"
44-
#include "xfs_dinode.h"
4543
#include "xfs_dir2.h"
4644

4745

fs/xfs/libxfs/xfs_attr_remote.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include "xfs_log_format.h"
2424
#include "xfs_trans_resv.h"
2525
#include "xfs_bit.h"
26-
#include "xfs_sb.h"
27-
#include "xfs_ag.h"
2826
#include "xfs_mount.h"
2927
#include "xfs_da_format.h"
3028
#include "xfs_da_btree.h"

0 commit comments

Comments
 (0)