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

Commit a77febbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: obey minleft values during extent allocation correctly
  xfs: reset buffer pointers before freeing them
  xfs: avoid getting stuck during async inode flushes
  xfs: fix xfs_itruncate_start tracing
  xfs: fix duplicate workqueue initialisation
  xfs: kill off xfs_printk()
  xfs: fix race condition in AIL push trigger
  xfs: make AIL target updates and compares 32bit safe.
  xfs: always push the AIL to the target
  xfs: exit AIL push work correctly when AIL is empty
  xfs: ensure reclaim cursor is reset correctly at end of AG
  xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
  xfs: fix compiler warning in xfs_trace.h
  xfs: cleanup duplicate initializations
  xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
  xfs: exact busy extent tracking
  xfs: do not immediately reuse busy extent ranges
  xfs: optimize AGFL refills
parents 42cd71bf bf59170a

fs/xfs/linux-2.6/xfs_buf.c

+21 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/migrate.h>

#include <linux/migrate.h>

#include <linux/backing-dev.h>

#include <linux/backing-dev.h>

#include <linux/freezer.h>

#include <linux/freezer.h>

#include <linux/list_sort.h>





#include "xfs_sb.h"

#include "xfs_sb.h"

#include "xfs_inum.h"

#include "xfs_inum.h"
@@ -709,6 +708,27 @@ xfs_buf_get_empty( 
	return bp;

	return bp;

}

}





/*

 * Return a buffer allocated as an empty buffer and associated to external

 * memory via xfs_buf_associate_memory() back to it's empty state.

 */

void

xfs_buf_set_empty(

	struct xfs_buf		*bp,

	size_t			len)

{

	if (bp->b_pages)

		_xfs_buf_free_pages(bp);



	bp->b_pages = NULL;

	bp->b_page_count = 0;

	bp->b_addr = NULL;

	bp->b_file_offset = 0;

	bp->b_buffer_length = bp->b_count_desired = len;

	bp->b_bn = XFS_BUF_DADDR_NULL;

	bp->b_flags &= ~XBF_MAPPED;

}



static inline struct page *

static inline struct page *

mem_to_page(

mem_to_page(

	void			*addr)

	void			*addr)

fs/xfs/linux-2.6/xfs_buf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,7 @@ extern xfs_buf_t *xfs_buf_read(xfs_buftarg_t *, xfs_off_t, size_t, 
				xfs_buf_flags_t);

				xfs_buf_flags_t);





extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *);

extern xfs_buf_t *xfs_buf_get_empty(size_t, xfs_buftarg_t *);

extern void xfs_buf_set_empty(struct xfs_buf *bp, size_t len);

extern xfs_buf_t *xfs_buf_get_uncached(struct xfs_buftarg *, size_t, int);

extern xfs_buf_t *xfs_buf_get_uncached(struct xfs_buftarg *, size_t, int);

extern int xfs_buf_associate_memory(xfs_buf_t *, void *, size_t);

extern int xfs_buf_associate_memory(xfs_buf_t *, void *, size_t);

extern void xfs_buf_hold(xfs_buf_t *);

extern void xfs_buf_hold(xfs_buf_t *);

fs/xfs/linux-2.6/xfs_ioctl32.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,8 @@ xfs_file_compat_ioctl( 
	case XFS_IOC_RESVSP_32:

	case XFS_IOC_RESVSP_32:

	case XFS_IOC_UNRESVSP_32:

	case XFS_IOC_UNRESVSP_32:

	case XFS_IOC_RESVSP64_32:

	case XFS_IOC_RESVSP64_32:

	case XFS_IOC_UNRESVSP64_32: {

	case XFS_IOC_UNRESVSP64_32:

	case XFS_IOC_ZERO_RANGE_32: {

		struct xfs_flock64	bf;

		struct xfs_flock64	bf;





		if (xfs_compat_flock64_copyin(&bf, arg))

		if (xfs_compat_flock64_copyin(&bf, arg))

fs/xfs/linux-2.6/xfs_ioctl32.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,7 @@ typedef struct compat_xfs_flock64 { 
#define XFS_IOC_UNRESVSP_32	_IOW('X', 41, struct compat_xfs_flock64)

#define XFS_IOC_UNRESVSP_32	_IOW('X', 41, struct compat_xfs_flock64)

#define XFS_IOC_RESVSP64_32	_IOW('X', 42, struct compat_xfs_flock64)

#define XFS_IOC_RESVSP64_32	_IOW('X', 42, struct compat_xfs_flock64)

#define XFS_IOC_UNRESVSP64_32	_IOW('X', 43, struct compat_xfs_flock64)

#define XFS_IOC_UNRESVSP64_32	_IOW('X', 43, struct compat_xfs_flock64)

#define XFS_IOC_ZERO_RANGE_32	_IOW('X', 57, struct compat_xfs_flock64)





typedef struct compat_xfs_fsop_geom_v1 {

typedef struct compat_xfs_fsop_geom_v1 {

	__u32		blocksize;	/* filesystem (data) block size */

	__u32		blocksize;	/* filesystem (data) block size */

fs/xfs/linux-2.6/xfs_linux.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include <linux/ctype.h>

#include <linux/ctype.h>

#include <linux/writeback.h>

#include <linux/writeback.h>

#include <linux/capability.h>

#include <linux/capability.h>

#include <linux/list_sort.h>





#include <asm/page.h>

#include <asm/page.h>

#include <asm/div64.h>

#include <asm/div64.h>