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

Commit 2a5a68b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge rsync://oss.sgi.com/git/xfs-2.6

parents 990a8baf e1a40fa9

fs/xfs/linux-2.6/xfs_buf.c

+77 −76
Original line number Diff line number Diff line
@@ -61,12 +61,13 @@ 
 * File wide globals

 */



STATIC kmem_cache_t *pagebuf_cache;

STATIC kmem_cache_t *pagebuf_zone;

STATIC kmem_shaker_t pagebuf_shake;

STATIC int pagebuf_daemon_wakeup(int, unsigned int);

STATIC int xfsbufd_wakeup(int, unsigned int);

STATIC void pagebuf_delwri_queue(xfs_buf_t *, int);

STATIC struct workqueue_struct *pagebuf_logio_workqueue;

STATIC struct workqueue_struct *pagebuf_dataio_workqueue;



STATIC struct workqueue_struct *xfslogd_workqueue;

STATIC struct workqueue_struct *xfsdatad_workqueue;



/*

 * Pagebuf debugging
@@ -123,9 +124,9 @@ ktrace_t *pagebuf_trace_buf; 




#define pagebuf_allocate(flags) \

	kmem_zone_alloc(pagebuf_cache, pb_to_km(flags))

	kmem_zone_alloc(pagebuf_zone, pb_to_km(flags))

#define pagebuf_deallocate(pb) \

	kmem_zone_free(pagebuf_cache, (pb));

	kmem_zone_free(pagebuf_zone, (pb));



/*

 * Page Region interfaces.
@@ -425,7 +426,7 @@ _pagebuf_lookup_pages( 
					__FUNCTION__, gfp_mask);



			XFS_STATS_INC(pb_page_retries);

			pagebuf_daemon_wakeup(0, gfp_mask);

			xfsbufd_wakeup(0, gfp_mask);

			blk_congestion_wait(WRITE, HZ/50);

			goto retry;

		}
@@ -1136,8 +1137,8 @@ pagebuf_iodone( 
	if ((pb->pb_iodone) || (pb->pb_flags & PBF_ASYNC)) {

		if (schedule) {

			INIT_WORK(&pb->pb_iodone_work, pagebuf_iodone_work, pb);

			queue_work(dataio ? pagebuf_dataio_workqueue :

				pagebuf_logio_workqueue, &pb->pb_iodone_work);

			queue_work(dataio ? xfsdatad_workqueue :

				xfslogd_workqueue, &pb->pb_iodone_work);

		} else {

			pagebuf_iodone_work(pb);

		}
@@ -1562,16 +1563,6 @@ xfs_free_buftarg( 
	kmem_free(btp, sizeof(*btp));

}



void

xfs_incore_relse(

	xfs_buftarg_t		*btp,

	int			delwri_only,

	int			wait)

{

	invalidate_bdev(btp->pbr_bdev, 1);

	truncate_inode_pages(btp->pbr_mapping, 0LL);

}



STATIC int

xfs_setsize_buftarg_flags(

	xfs_buftarg_t		*btp,
@@ -1742,27 +1733,27 @@ pagebuf_runall_queues( 
}



/* Defines for pagebuf daemon */

STATIC DECLARE_COMPLETION(pagebuf_daemon_done);

STATIC struct task_struct *pagebuf_daemon_task;

STATIC int pagebuf_daemon_active;

STATIC int force_flush;

STATIC int force_sleep;

STATIC DECLARE_COMPLETION(xfsbufd_done);

STATIC struct task_struct *xfsbufd_task;

STATIC int xfsbufd_active;

STATIC int xfsbufd_force_flush;

STATIC int xfsbufd_force_sleep;



STATIC int

pagebuf_daemon_wakeup(

xfsbufd_wakeup(

	int			priority,

	unsigned int		mask)

{

	if (force_sleep)

	if (xfsbufd_force_sleep)

		return 0;

	force_flush = 1;

	xfsbufd_force_flush = 1;

	barrier();

	wake_up_process(pagebuf_daemon_task);

	wake_up_process(xfsbufd_task);

	return 0;

}



STATIC int

pagebuf_daemon(

xfsbufd(

	void			*data)

{

	struct list_head	tmp;
@@ -1774,17 +1765,17 @@ pagebuf_daemon( 
	daemonize("xfsbufd");

	current->flags |= PF_MEMALLOC;



	pagebuf_daemon_task = current;

	pagebuf_daemon_active = 1;

	xfsbufd_task = current;

	xfsbufd_active = 1;

	barrier();



	INIT_LIST_HEAD(&tmp);

	do {

		if (unlikely(current->flags & PF_FREEZE)) {

			force_sleep = 1;

			xfsbufd_force_sleep = 1;

			refrigerator(PF_FREEZE);

		} else {

			force_sleep = 0;

			xfsbufd_force_sleep = 0;

		}



		set_current_state(TASK_INTERRUPTIBLE);
@@ -1797,7 +1788,7 @@ pagebuf_daemon( 
			ASSERT(pb->pb_flags & PBF_DELWRI);



			if (!pagebuf_ispin(pb) && !pagebuf_cond_lock(pb)) {

				if (!force_flush &&

				if (!xfsbufd_force_flush &&

				    time_before(jiffies,

						pb->pb_queuetime + age)) {

					pagebuf_unlock(pb);
@@ -1824,10 +1815,10 @@ pagebuf_daemon( 
		if (as_list_len > 0)

			purge_addresses();



		force_flush = 0;

	} while (pagebuf_daemon_active);

		xfsbufd_force_flush = 0;

	} while (xfsbufd_active);



	complete_and_exit(&pagebuf_daemon_done, 0);

	complete_and_exit(&xfsbufd_done, 0);

}



/*
@@ -1844,8 +1835,8 @@ xfs_flush_buftarg( 
	xfs_buf_t		*pb, *n;

	int			pincount = 0;



	pagebuf_runall_queues(pagebuf_dataio_workqueue);

	pagebuf_runall_queues(pagebuf_logio_workqueue);

	pagebuf_runall_queues(xfsdatad_workqueue);

	pagebuf_runall_queues(xfslogd_workqueue);



	INIT_LIST_HEAD(&tmp);

	spin_lock(&pbd_delwrite_lock);
@@ -1898,43 +1889,43 @@ xfs_flush_buftarg( 
}



STATIC int

pagebuf_daemon_start(void)

xfs_buf_daemons_start(void)

{

	int		rval;

	int		error = -ENOMEM;



	pagebuf_logio_workqueue = create_workqueue("xfslogd");

	if (!pagebuf_logio_workqueue)

		return -ENOMEM;

	xfslogd_workqueue = create_workqueue("xfslogd");

	if (!xfslogd_workqueue)

		goto out;



	pagebuf_dataio_workqueue = create_workqueue("xfsdatad");

	if (!pagebuf_dataio_workqueue) {

		destroy_workqueue(pagebuf_logio_workqueue);

		return -ENOMEM;

	}

	xfsdatad_workqueue = create_workqueue("xfsdatad");

	if (!xfsdatad_workqueue)

		goto out_destroy_xfslogd_workqueue;



	rval = kernel_thread(pagebuf_daemon, NULL, CLONE_FS|CLONE_FILES);

	if (rval < 0) {

		destroy_workqueue(pagebuf_logio_workqueue);

		destroy_workqueue(pagebuf_dataio_workqueue);

	}

	error = kernel_thread(xfsbufd, NULL, CLONE_FS|CLONE_FILES);

	if (error < 0)

		goto out_destroy_xfsdatad_workqueue;

	return 0;



	return rval;

 out_destroy_xfsdatad_workqueue:

	destroy_workqueue(xfsdatad_workqueue);

 out_destroy_xfslogd_workqueue:

	destroy_workqueue(xfslogd_workqueue);

 out:

	return error;

}



/*

 * pagebuf_daemon_stop

 *

 * Note: do not mark as __exit, it is called from pagebuf_terminate.

 */

STATIC void

pagebuf_daemon_stop(void)

xfs_buf_daemons_stop(void)

{

	pagebuf_daemon_active = 0;

	xfsbufd_active = 0;

	barrier();

	wait_for_completion(&pagebuf_daemon_done);

	wait_for_completion(&xfsbufd_done);



	destroy_workqueue(pagebuf_logio_workqueue);

	destroy_workqueue(pagebuf_dataio_workqueue);

	destroy_workqueue(xfslogd_workqueue);

	destroy_workqueue(xfsdatad_workqueue);

}



/*
@@ -1944,27 +1935,37 @@ pagebuf_daemon_stop(void) 
int __init

pagebuf_init(void)

{

	pagebuf_cache = kmem_cache_create("xfs_buf_t", sizeof(xfs_buf_t), 0,

			SLAB_HWCACHE_ALIGN, NULL, NULL);

	if (pagebuf_cache == NULL) {

		printk("XFS: couldn't init xfs_buf_t cache\n");

		pagebuf_terminate();

		return -ENOMEM;

	}

	int		error = -ENOMEM;



	pagebuf_zone = kmem_zone_init(sizeof(xfs_buf_t), "xfs_buf");

	if (!pagebuf_zone)

		goto out;



#ifdef PAGEBUF_TRACE

	pagebuf_trace_buf = ktrace_alloc(PAGEBUF_TRACE_SIZE, KM_SLEEP);

#endif



	pagebuf_daemon_start();

	error = xfs_buf_daemons_start();

	if (error)

		goto out_free_buf_zone;



	pagebuf_shake = kmem_shake_register(pagebuf_daemon_wakeup);

	if (pagebuf_shake == NULL) {

		pagebuf_terminate();

		return -ENOMEM;

	pagebuf_shake = kmem_shake_register(xfsbufd_wakeup);

	if (!pagebuf_shake) {

		error = -ENOMEM;

		goto out_stop_daemons;

	}



	return 0;



 out_stop_daemons:

	xfs_buf_daemons_stop();

 out_free_buf_zone:

#ifdef PAGEBUF_TRACE

	ktrace_free(pagebuf_trace_buf);

#endif

	kmem_zone_destroy(pagebuf_zone);

 out:

	return error;

}
@@ -1976,12 +1977,12 @@ pagebuf_init(void) 
void

pagebuf_terminate(void)

{

	pagebuf_daemon_stop();

	xfs_buf_daemons_stop();



#ifdef PAGEBUF_TRACE

	ktrace_free(pagebuf_trace_buf);

#endif



	kmem_zone_destroy(pagebuf_cache);

	kmem_zone_destroy(pagebuf_zone);

	kmem_shake_deregister(pagebuf_shake);

}

fs/xfs/linux-2.6/xfs_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ extern xfs_buftarg_t *xfs_alloc_buftarg(struct block_device *, int); 
extern void xfs_free_buftarg(xfs_buftarg_t *, int);

extern void xfs_wait_buftarg(xfs_buftarg_t *);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);

extern void xfs_incore_relse(xfs_buftarg_t *, int, int);

extern int xfs_flush_buftarg(xfs_buftarg_t *, int);



#define xfs_getsize_buftarg(buftarg) \

fs/xfs/linux-2.6/xfs_file.c

+24 −3
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ 
#include <linux/smp_lock.h>



static struct vm_operations_struct linvfs_file_vm_ops;



#ifdef CONFIG_XFS_DMAPI

static struct vm_operations_struct linvfs_dmapi_file_vm_ops;

#endif



STATIC inline ssize_t

__linvfs_read(
@@ -388,6 +390,14 @@ done: 
	return -error;

}



#ifdef CONFIG_XFS_DMAPI

STATIC void

linvfs_mmap_close(

	struct vm_area_struct	*vma)

{

	xfs_dm_mm_put(vma);

}

#endif /* CONFIG_XFS_DMAPI */



STATIC int

linvfs_file_mmap(
@@ -399,16 +409,19 @@ linvfs_file_mmap( 
	vattr_t		va = { .va_mask = XFS_AT_UPDATIME };

	int		error;



	vma->vm_ops = &linvfs_file_vm_ops;



	if (vp->v_vfsp->vfs_flag & VFS_DMI) {

		xfs_mount_t	*mp = XFS_VFSTOM(vp->v_vfsp);



		error = -XFS_SEND_MMAP(mp, vma, 0);

		if (error)

			return error;

#ifdef CONFIG_XFS_DMAPI

		vma->vm_ops = &linvfs_dmapi_file_vm_ops;

#endif

	}



	vma->vm_ops = &linvfs_file_vm_ops;



	VOP_SETATTR(vp, &va, XFS_AT_UPDATIME, NULL, error);

	if (!error)

		vn_revalidate(vp);	/* update Linux inode flags */
@@ -609,7 +622,15 @@ struct file_operations linvfs_dir_operations = { 
static struct vm_operations_struct linvfs_file_vm_ops = {

	.nopage		= filemap_nopage,

	.populate	= filemap_populate,

};



#ifdef CONFIG_XFS_DMAPI

static struct vm_operations_struct linvfs_dmapi_file_vm_ops = {

	.close		= linvfs_mmap_close,

	.nopage		= filemap_nopage,

	.populate	= filemap_populate,

#ifdef HAVE_VMOP_MPROTECT

	.mprotect	= linvfs_mprotect,

#endif

};

#endif /* CONFIG_XFS_DMAPI */

fs/xfs/linux-2.6/xfs_ioctl.c

+8 −3
Original line number Diff line number Diff line
@@ -1174,7 +1174,8 @@ xfs_ioc_xattr( 


	switch (cmd) {

	case XFS_IOC_FSGETXATTR: {

		va.va_mask = XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_NEXTENTS;

		va.va_mask = XFS_AT_XFLAGS | XFS_AT_EXTSIZE | \

			     XFS_AT_NEXTENTS | XFS_AT_PROJID;

		VOP_GETATTR(vp, &va, 0, NULL, error);

		if (error)

			return -error;
@@ -1182,6 +1183,7 @@ xfs_ioc_xattr( 
		fa.fsx_xflags	= va.va_xflags;

		fa.fsx_extsize	= va.va_extsize;

		fa.fsx_nextents = va.va_nextents;

		fa.fsx_projid	= va.va_projid;



		if (copy_to_user(arg, &fa, sizeof(fa)))

			return -XFS_ERROR(EFAULT);
@@ -1196,9 +1198,10 @@ xfs_ioc_xattr( 
		if (filp->f_flags & (O_NDELAY|O_NONBLOCK))

			attr_flags |= ATTR_NONBLOCK;



		va.va_mask = XFS_AT_XFLAGS | XFS_AT_EXTSIZE;

		va.va_mask = XFS_AT_XFLAGS | XFS_AT_EXTSIZE | XFS_AT_PROJID;

		va.va_xflags  = fa.fsx_xflags;

		va.va_extsize = fa.fsx_extsize;

		va.va_projid  = fa.fsx_projid;



		VOP_SETATTR(vp, &va, attr_flags, NULL, error);

		if (!error)
@@ -1207,7 +1210,8 @@ xfs_ioc_xattr( 
	}



	case XFS_IOC_FSGETXATTRA: {

		va.va_mask = XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_ANEXTENTS;

		va.va_mask = XFS_AT_XFLAGS | XFS_AT_EXTSIZE | \

			     XFS_AT_ANEXTENTS | XFS_AT_PROJID;

		VOP_GETATTR(vp, &va, 0, NULL, error);

		if (error)

			return -error;
@@ -1215,6 +1219,7 @@ xfs_ioc_xattr( 
		fa.fsx_xflags	= va.va_xflags;

		fa.fsx_extsize	= va.va_extsize;

		fa.fsx_nextents = va.va_anextents;

		fa.fsx_projid	= va.va_projid;



		if (copy_to_user(arg, &fa, sizeof(fa)))

			return -XFS_ERROR(EFAULT);

fs/xfs/linux-2.6/xfs_linux.h

+4 −2
Original line number Diff line number Diff line
@@ -230,8 +230,10 @@ static inline void set_buffer_unwritten_io(struct buffer_head *bh) 
 * field (see the QCMD macro in quota.h).  These macros help keep the

 * code portable - they are not visible from the syscall interface.

 */

#define Q_XSETGQLIM	XQM_CMD(0x8)	/* set groups disk limits */

#define Q_XGETGQUOTA	XQM_CMD(0x9)	/* get groups disk limits */

#define Q_XSETGQLIM	XQM_CMD(8)	/* set groups disk limits */

#define Q_XGETGQUOTA	XQM_CMD(9)	/* get groups disk limits */

#define Q_XSETPQLIM	XQM_CMD(10)	/* set projects disk limits */

#define Q_XGETPQUOTA	XQM_CMD(11)	/* get projects disk limits */



/* IRIX uses a dynamic sizing algorithm (ndquot = 200 + numprocs*2) */

/* we may well need to fine-tune this if it ever becomes an issue.  */