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

Commit 7e1a1e93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs update from Ben Myers:
 "For 3.13-rc1 we have an eclectic assortment of bugfixes, cleanups, and
  refactoring.  Bugfixes that stand out are the fix for the AGF/AGI
  deadlock, incore extent list fixes, verifier fixes for v4 superblocks
  and growfs, and memory leaks.  There are some asserts, warnings, and
  strings that were cleaned up.  There was further rearrangement of code
  to make libxfs and the kernel sync up more easily, differences between
  v2 and v3 directory code were abstracted using an ops vector,
  xfs_inactive was reworked, and the preallocation/hole punching code
  was refactored.

   - simplify kmem_zone_zalloc
   - add traces for AGF/AGI read ops
   - add additional AIL traces
   - fix xfs_remove AGF vs AGI deadlock
   - fix the extent count of new incore extent page in the indirection
     array
   - don't fail bad secondary superblocks verification on v4 filesystems
     due to unzeroed bits after v4 fields
   - fix possible NULL dereference in xlog_verify_iclog
   - remove redundant assert in xfs_dir2_leafn_split
   - prevent stack overflows from page cache allocation
   - fix some sparse warnings
   - fix directory block format verifier to check the leaf entry count
   - abstract the differences in dir2/dir3 via an ops vector
   - continue process of reorganization to make libxfs/kernel code
     merges easier
   - refactor the preallocation and hole punching code
   - fix for growfs and verifiers
   - remove unnecessary scary corruption error when probing non-xfs
     filesystems
   - remove extra newlines from strings passed to printk
   - prevent deadlock trying to cover an active log
   - rework xfs_inactive()
   - add the inode directory type support to XFS_IOC_FSGEOM
   - cleanup (remove) usage of is_bad_inode
   - fix miscalculation in xfs_iext_realloc_direct which results in
     oversized direct extent list
   - remove unnecessary count arg to xfs_iomap_write_allocate
   - fix memory leak in xlog_recover_add_to_trans
   - check superblock instead of block magic to determine if dtype field
     is present
   - fix lockdep annotation due to project quotas
   - fix regression in xfs_node_toosmall which can lead to incorrect
     directory btree node collapse
   - make log recovery verify filesystem uuid of recovering blocks
   - fix XFS_IOC_FREE_EOFBLOCKS definition
   - remove invalid assert in xfs_inode_free
   - fix for AIL lock regression"

* tag 'xfs-for-linus-v3.13-rc1' of git://oss.sgi.com/xfs/xfs: (49 commits)
  xfs: simplify kmem_{zone_}zalloc
  xfs: add tracepoints to AGF/AGI read operations
  xfs: trace AIL manipulations
  xfs: xfs_remove deadlocks due to inverted AGF vs AGI lock ordering
  xfs: fix the extent count when allocating an new indirection array entry
  xfs: be more forgiving of a v4 secondary sb w/ junk in v5 fields
  xfs: fix possible NULL dereference in xlog_verify_iclog
  xfs:xfs_dir2_node.c: pointer use before check for null
  xfs: prevent stack overflows from page cache allocation
  xfs: fix static and extern sparse warnings
  xfs: validity check the directory block leaf entry count
  xfs: make dir2 ftype offset pointers explicit
  xfs: convert directory vector functions to constants
  xfs: convert directory vector functions to constants
  xfs: vectorise encoding/decoding directory headers
  xfs: vectorise DA btree operations
  xfs: vectorise directory leaf operations
  xfs: vectorise directory data operations part 2
  xfs: vectorise directory data operations
  xfs: vectorise remaining shortform dir2 ops
  ...
parents fcd7476f 359d992b

fs/xfs/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -66,12 +66,14 @@ xfs-y += xfs_alloc.o \ 
				   xfs_bmap_btree.o \

				   xfs_btree.o \

				   xfs_da_btree.o \

				   xfs_da_format.o \

				   xfs_dir2.o \

				   xfs_dir2_block.o \

				   xfs_dir2_data.o \

				   xfs_dir2_leaf.o \

				   xfs_dir2_node.o \

				   xfs_dir2_sf.o \

				   xfs_dquot_buf.o \

				   xfs_ialloc.o \

				   xfs_ialloc_btree.o \

				   xfs_icreate_item.o \
@@ -103,7 +105,11 @@ xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \ 
				   xfs_qm_bhv.o \

				   xfs_qm.o \

				   xfs_quotaops.o

xfs-$(CONFIG_XFS_RT)		+= xfs_rtalloc.o



# xfs_rtbitmap is shared with libxfs

xfs-$(CONFIG_XFS_RT)		+= xfs_rtalloc.o \

				   xfs_rtbitmap.o



xfs-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o

xfs-$(CONFIG_PROC_FS)		+= xfs_stats.o

xfs-$(CONFIG_SYSCTL)		+= xfs_sysctl.o

fs/xfs/kmem.c

+0 −22
Original line number Diff line number Diff line
@@ -62,17 +62,6 @@ kmem_alloc(size_t size, xfs_km_flags_t flags) 
	} while (1);

}



void *

kmem_zalloc(size_t size, xfs_km_flags_t flags)

{

	void	*ptr;



	ptr = kmem_alloc(size, flags);

	if (ptr)

		memset((char *)ptr, 0, (int)size);

	return ptr;

}



void *

kmem_zalloc_large(size_t size, xfs_km_flags_t flags)

{
@@ -128,14 +117,3 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags) 
		congestion_wait(BLK_RW_ASYNC, HZ/50);

	} while (1);

}
 


void *

kmem_zone_zalloc(kmem_zone_t *zone, xfs_km_flags_t flags)

{

	void	*ptr;



	ptr = kmem_zone_alloc(zone, flags);

	if (ptr)

		memset((char *)ptr, 0, kmem_cache_size(zone));

	return ptr;

}

fs/xfs/kmem.h

+18 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ typedef unsigned __bitwise xfs_km_flags_t; 
#define KM_NOSLEEP	((__force xfs_km_flags_t)0x0002u)

#define KM_NOFS		((__force xfs_km_flags_t)0x0004u)

#define KM_MAYFAIL	((__force xfs_km_flags_t)0x0008u)

#define KM_ZERO		((__force xfs_km_flags_t)0x0010u)



/*

 * We use a special process flag to avoid recursive callbacks into
@@ -43,7 +44,7 @@ kmem_flags_convert(xfs_km_flags_t flags) 
{

	gfp_t	lflags;



	BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL));

	BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL|KM_ZERO));



	if (flags & KM_NOSLEEP) {

		lflags = GFP_ATOMIC | __GFP_NOWARN;
@@ -52,11 +53,14 @@ kmem_flags_convert(xfs_km_flags_t flags) 
		if ((current->flags & PF_FSTRANS) || (flags & KM_NOFS))

			lflags &= ~__GFP_FS;

	}



	if (flags & KM_ZERO)

		lflags |= __GFP_ZERO;



	return lflags;

}



extern void *kmem_alloc(size_t, xfs_km_flags_t);

extern void *kmem_zalloc(size_t, xfs_km_flags_t);

extern void *kmem_zalloc_large(size_t size, xfs_km_flags_t);

extern void *kmem_realloc(const void *, size_t, size_t, xfs_km_flags_t);

extern void  kmem_free(const void *);
@@ -64,6 +68,12 @@ extern void kmem_free(const void *); 


extern void *kmem_zalloc_greedy(size_t *, size_t, size_t);



static inline void *

kmem_zalloc(size_t size, xfs_km_flags_t flags)

{

	return kmem_alloc(size, flags | KM_ZERO);

}



/*

 * Zone interfaces

 */
@@ -102,6 +112,11 @@ kmem_zone_destroy(kmem_zone_t *zone) 
}



extern void *kmem_zone_alloc(kmem_zone_t *, xfs_km_flags_t);

extern void *kmem_zone_zalloc(kmem_zone_t *, xfs_km_flags_t);



static inline void *

kmem_zone_zalloc(kmem_zone_t *zone, xfs_km_flags_t flags)

{

	return kmem_zone_alloc(zone, flags | KM_ZERO);

}



#endif /* __XFS_SUPPORT_KMEM_H__ */

fs/xfs/xfs_acl.c

+4 −4
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_acl.h"

#include "xfs_attr.h"

#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "xfs_ag.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_inode.h"

#include "xfs_acl.h"

#include "xfs_attr.h"

#include "xfs_trace.h"

#include <linux/slab.h>

#include <linux/xattr.h>

fs/xfs/xfs_ag.h

+0 −4
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ 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.

 */
@@ -191,8 +189,6 @@ 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.