Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f1c64f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-v3.8-rc1' of git://oss.sgi.com/xfs/xfs 

Pull xfs update from Ben Myers:
 "There is plenty going on, including the cleanup of xfssyncd, metadata
  verifiers, CRC infrastructure for the log, tracking of inodes with
  speculative allocation, a cleanup of xfs_fs_subr.c, fixes for
  XFS_IOC_ZERO_RANGE, and important fix related to log replay (only
  update the last_sync_lsn when a transaction completes), a fix for
  deadlock on AGF buffers, documentation and comment updates, and a few
  more cleanups and fixes.

  Details:
   - remove the xfssyncd mess
   - only update the last_sync_lsn when a transaction completes
   - zero allocation_args on the kernel stack
   - fix AGF/alloc workqueue deadlock
   - silence uninitialised f.file warning
   - Update inode alloc comments
   - Update mount options documentation
   - report projid32bit feature in geometry call
   - speculative preallocation inode tracking
   - fix attr tree double split corruption
   - fix broken error handling in xfs_vm_writepage
   - drop buffer io reference when a bad bio is built
   - add more attribute tree trace points
   - growfs infrastructure changes for 3.8
   - fs/xfs/xfs_fs_subr.c die die die
   - add CRC infrastructure
   - add CRC checks to the log
   - Remove description of nodelaylog mount option from xfs.txt
   - inode allocation should use unmapped buffers
   - byte range granularity for XFS_IOC_ZERO_RANGE
   - fix direct IO nested transaction deadlock
   - fix stray dquot unlock when reclaiming dquots
   - fix sparse reported log CRC endian issue"

Fix up trivial conflict in fs/xfs/xfs_fsops.c due to the same patch
having been applied twice (commits eaef8543 and 1375cb65: "xfs:
growfs: don't read garbage for new secondary superblocks") with later
updates to the affected code in the XFS tree.

* tag 'for-linus-v3.8-rc1' of git://oss.sgi.com/xfs/xfs: (78 commits)
  xfs: fix sparse reported log CRC endian issue
  xfs: fix stray dquot unlock when reclaiming dquots
  xfs: fix direct IO nested transaction deadlock.
  xfs: byte range granularity for XFS_IOC_ZERO_RANGE
  xfs: inode allocation should use unmapped buffers.
  xfs: Remove the description of nodelaylog mount option from xfs.txt
  xfs: add CRC checks to the log
  xfs: add CRC infrastructure
  xfs: convert buffer verifiers to an ops structure.
  xfs: connect up write verifiers to new buffers
  xfs: add pre-write metadata buffer verifier callbacks
  xfs: add buffer pre-write callback
  xfs: Add verifiers to dir2 data readahead.
  xfs: add xfs_da_node verification
  xfs: factor and verify attr leaf reads
  xfs: factor dir2 leaf read
  xfs: factor out dir2 data block reading
  xfs: factor dir2 free block reading
  xfs: verify dir2 block format buffers
  xfs: factor dir2 block read operations
  ...
parents 22a40fd9 f9668a09

Documentation/filesystems/xfs.txt

+10 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ When mounting an XFS filesystem, the following options are accepted. 
	Issue command to let the block device reclaim space freed by the

	filesystem.  This is useful for SSD devices, thinly provisioned

	LUNs and virtual machine images, but may have a performance

	impact.  This option is incompatible with the nodelaylog option.

	impact.



  dmapi

	Enable the DMAPI (Data Management API) event callouts.
@@ -72,8 +72,15 @@ When mounting an XFS filesystem, the following options are accepted. 
	Indicates that XFS is allowed to create inodes at any location

	in the filesystem, including those which will result in inode

	numbers occupying more than 32 bits of significance.  This is

	provided for backwards compatibility, but causes problems for

	backup applications that cannot handle large inode numbers.

	the default allocation option. Applications which do not handle

	inode numbers bigger than 32 bits, should use inode32 option.



  inode32

	Indicates that XFS is limited to create inodes at locations which

	will not result in inode numbers with more than 32 bits of

	significance. This is provided for backwards compatibility, since

	64 bits inode numbers might cause problems for some applications

	that cannot handle large inode numbers.



  largeio/nolargeio

	If "nolargeio" is specified, the optimal I/O reported in

fs/xfs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config XFS_FS 
	tristate "XFS filesystem support"

	depends on BLOCK

	select EXPORTFS

	select LIBCRC32C

	help

	  XFS is a high performance journaling filesystem which originated

	  on the SGI IRIX platform.  It is completely multi-threaded, can

fs/xfs/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ xfs-y += xfs_aops.o \ 
				   xfs_file.o \

				   xfs_filestream.o \

				   xfs_fsops.o \

				   xfs_fs_subr.o \

				   xfs_globals.o \

				   xfs_iget.o \

				   xfs_icache.o \

				   xfs_ioctl.o \

				   xfs_iomap.o \

				   xfs_iops.o \
@@ -47,7 +46,6 @@ xfs-y += xfs_aops.o \ 
				   xfs_message.o \

				   xfs_mru_cache.o \

				   xfs_super.o \

				   xfs_sync.o \

				   xfs_xattr.o \

				   xfs_rename.o \

				   xfs_utils.o \

fs/xfs/uuid.h

+6 −0
Original line number Diff line number Diff line
@@ -26,4 +26,10 @@ extern int uuid_is_nil(uuid_t *uuid); 
extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2);

extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]);



static inline void

uuid_copy(uuid_t *dst, uuid_t *src)

{

	memcpy(dst, src, sizeof(uuid_t));

}



#endif	/* __XFS_SUPPORT_UUID_H__ */

fs/xfs/xfs_ag.h

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ typedef struct xfs_agf { 
extern int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,

			xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);



extern const struct xfs_buf_ops xfs_agf_buf_ops;



/*

 * Size of the unlinked inode hash table in the agi.

 */
@@ -161,6 +163,8 @@ typedef struct xfs_agi { 
extern int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp,

				xfs_agnumber_t agno, struct xfs_buf **bpp);



extern const struct xfs_buf_ops xfs_agi_buf_ops;



/*

 * The third a.g. block contains the a.g. freelist, an array

 * of block pointers to blocks owned by the allocation btree code.
@@ -233,6 +237,7 @@ typedef struct xfs_perag { 
#define XFS_ICI_NO_TAG		(-1)	/* special flag for an untagged lookup

					   in xfs_inode_ag_iterator */

#define XFS_ICI_RECLAIM_TAG	0	/* inode is to be reclaimed */

#define XFS_ICI_EOFBLOCKS_TAG	1	/* inode has blocks beyond EOF */



#define	XFS_AG_MAXLEVELS(mp)		((mp)->m_ag_maxlevels)

#define	XFS_MIN_FREELIST_RAW(bl,cl,mp)	\