diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 12:48:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 12:48:17 -0500 |
| commit | c05e14f7b3145ac89635fa398934438240dace40 (patch) | |
| tree | 5c28b928cf630ef10464e325a7dee03210b3793e | |
| parent | 9bfccec24e31f4f83445cfe0c1b0a5ef97900628 (diff) | |
| parent | 6044e4386cd51dece882ea42352cdaaab0f24cad (diff) | |
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()
...
89 files changed, 1467 insertions, 1835 deletions
diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h deleted file mode 100644 index 6e247a99f5db..000000000000 --- a/fs/xfs/libxfs/xfs_ag.h +++ /dev/null | |||
| @@ -1,281 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. | ||
| 3 | * All Rights Reserved. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or | ||
| 6 | * modify it under the terms of the GNU General Public License as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it would be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program; if not, write the Free Software Foundation, | ||
| 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 17 | */ | ||
| 18 | #ifndef __XFS_AG_H__ | ||
| 19 | #define __XFS_AG_H__ | ||
| 20 | |||
| 21 | /* | ||
| 22 | * Allocation group header | ||
| 23 | * This is divided into three structures, placed in sequential 512-byte | ||
| 24 | * buffers after a copy of the superblock (also in a 512-byte buffer). | ||
| 25 | */ | ||
| 26 | |||
| 27 | struct xfs_buf; | ||
| 28 | struct xfs_mount; | ||
| 29 | struct xfs_trans; | ||
| 30 | |||
| 31 | #define XFS_AGF_MAGIC 0x58414746 /* 'XAGF' */ | ||
| 32 | #define XFS_AGI_MAGIC 0x58414749 /* 'XAGI' */ | ||
| 33 | #define XFS_AGFL_MAGIC 0x5841464c /* 'XAFL' */ | ||
| 34 | #define XFS_AGF_VERSION 1 | ||
| 35 | #define XFS_AGI_VERSION 1 | ||
| 36 | |||
| 37 | #define XFS_AGF_GOOD_VERSION(v) ((v) == XFS_AGF_VERSION) | ||
| 38 | #define XFS_AGI_GOOD_VERSION(v) ((v) == XFS_AGI_VERSION) | ||
| 39 | |||
| 40 | /* | ||
| 41 | * Btree number 0 is bno, 1 is cnt. This value gives the size of the | ||
| 42 | * arrays below. | ||
| 43 | */ | ||
| 44 | #define XFS_BTNUM_AGF ((int)XFS_BTNUM_CNTi + 1) | ||
| 45 | |||
| 46 | /* | ||
| 47 | * The second word of agf_levels in the first a.g. overlaps the EFS | ||
| 48 | * superblock's magic number. Since the magic numbers valid for EFS | ||
| 49 | * are > 64k, our value cannot be confused for an EFS superblock's. | ||
| 50 | */ | ||
| 51 | |||
| 52 | typedef struct xfs_agf { | ||
| 53 | /* | ||
| 54 | * Common allocation group header information | ||
| 55 | */ | ||
| 56 | __be32 agf_magicnum; /* magic number == XFS_AGF_MAGIC */ | ||
| 57 | __be32 agf_versionnum; /* header version == XFS_AGF_VERSION */ | ||
| 58 | __be32 agf_seqno; /* sequence # starting from 0 */ | ||
| 59 | __be32 agf_length; /* size in blocks of a.g. */ | ||
| 60 | /* | ||
| 61 | * Freespace information | ||
| 62 | */ | ||
| 63 | __be32 agf_roots[XFS_BTNUM_AGF]; /* root blocks */ | ||
| 64 | __be32 agf_spare0; /* spare field */ | ||
| 65 | __be32 agf_levels[XFS_BTNUM_AGF]; /* btree levels */ | ||
| 66 | __be32 agf_spare1; /* spare field */ | ||
| 67 | |||