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

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

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] fix nasty quota hashtable allocation bug
  [XFS] fix sparse shadowed variable warnings
  [XFS] fix ASSERT and ASSERT_ALWAYS
  [XFS] Fix sparse warning in kmem_shake_allow
  [XFS] Fix sparse NULL vs 0 warnings
  [XFS] Set filestreams object timeout to something sane.
parents 83dc3d43 5995cb7d

fs/xfs/linux-2.6/kmem.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast); 
static inline int

kmem_shake_allow(gfp_t gfp_mask)

{

	return (gfp_mask & __GFP_WAIT);

	return (gfp_mask & __GFP_WAIT) != 0;

}



#endif /* __XFS_SUPPORT_KMEM_H__ */

fs/xfs/linux-2.6/xfs_aops.c

+4 −4
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ xfs_probe_cluster( 


		for (i = 0; i < pagevec_count(&pvec); i++) {

			struct page *page = pvec.pages[i];

			size_t pg_offset, len = 0;

			size_t pg_offset, pg_len = 0;



			if (tindex == tlast) {

				pg_offset =
@@ -665,16 +665,16 @@ xfs_probe_cluster( 
				pg_offset = PAGE_CACHE_SIZE;



			if (page->index == tindex && !TestSetPageLocked(page)) {

				len = xfs_probe_page(page, pg_offset, mapped);

				pg_len = xfs_probe_page(page, pg_offset, mapped);

				unlock_page(page);

			}



			if (!len) {

			if (!pg_len) {

				done = 1;

				break;

			}



			total += len;

			total += pg_len;

			tindex++;

		}

fs/xfs/linux-2.6/xfs_globals.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ xfs_param_t xfs_params = { 
	.inherit_nosym	= {	0,		0,		1	},

	.rotorstep	= {	1,		1,		255	},

	.inherit_nodfrg	= {	0,		1,		1	},

	.fstrm_timer	= {	1,		50,		3600*100},

	.fstrm_timer	= {	1,		30*100,		3600*100},

};



/*

fs/xfs/quota/xfs_qm.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ xfs_Gqm_init(void) 
	 * Initialize the dquot hash tables.

	 */

	udqhash = kmem_zalloc_greedy(&hsize,

				     XFS_QM_HASHSIZE_LOW, XFS_QM_HASHSIZE_HIGH,

				     XFS_QM_HASHSIZE_LOW * sizeof(xfs_dqhash_t),

				     XFS_QM_HASHSIZE_HIGH * sizeof(xfs_dqhash_t),

				     KM_SLEEP | KM_MAYFAIL | KM_LARGE);

	gdqhash = kmem_zalloc(hsize, KM_SLEEP | KM_LARGE);

	hsize /= sizeof(xfs_dqhash_t);

fs/xfs/support/debug.h

+6 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ extern void cmn_err(int, char *, ...) 
extern void assfail(char *expr, char *f, int l);



#define ASSERT_ALWAYS(expr)	\

	(unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__))

	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))



#ifndef DEBUG

#define ASSERT(expr)	((void)0)
@@ -49,9 +49,11 @@ extern void assfail(char *expr, char *f, int l); 


#else /* DEBUG */



# define ASSERT(expr)	ASSERT_ALWAYS(expr)

#include <linux/random.h>



#define ASSERT(expr)	\

	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))



#ifndef STATIC

# define STATIC noinline

#endif