Alex Elder 92f1c008ae Merge branch 'master' into for-linus-merged ... This merge pulls the XFS master branch into the latest Linus master. This results in a merge conflict whose best fix is not obvious. I manually fixed the conflict, in "fs/xfs/xfs_iget.c". Dave Chinner had done work that resulted in RCU freeing of inodes separate from what Nick Piggin had done, and their results differed slightly in xfs_inode_free(). The fix updates Nick's call_rcu() with the use of VFS_I(), while incorporating needed updates to some XFS inode fields implemented in Dave's series. Dave's RCU callback function has also been removed. Signed-off-by: Alex Elder <aelder@sgi.com>		2011-01-10 21:35:55 -06:00
..
kmem.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
kmem.h	xfs: replace KM_LARGE with explicit vmalloc use	2010-01-21 13:44:56 -06:00
mrlock.h	[XFS] shrink mrlock_t	2008-04-29 15:54:02 +10:00
time.h	…
xfs_acl.c	xfs: provide simple rcu-walk ACL implementation	2011-01-07 17:50:30 +11:00
xfs_aops.c	xfs: simplify xfs_map_at_offset	2010-12-16 16:06:07 -06:00
xfs_aops.h	xfs: kill xfs_iomap	2010-12-16 16:05:51 -06:00
xfs_buf.c	xfs: add a lru to the XFS buffer cache	2010-12-02 16:30:55 +11:00
xfs_buf.h	xfs: connect up buffer reclaim priority hooks	2010-12-02 16:31:13 +11:00
xfs_export.c	xfs: fix exporting with left over 64-bit inodes	2010-12-16 16:04:55 -06:00
xfs_export.h	xfs: new export ops	2007-10-22 08:13:20 -07:00
xfs_file.c	xfs: remove a dmapi leftover	2010-07-26 13:16:47 -05:00
xfs_fs_subr.c	xfs: use range primitives for xfs page cache operations	2010-10-18 15:07:24 -05:00
xfs_globals.c	xfs: remove xfs_cred.h	2010-10-18 15:08:06 -05:00
xfs_ioctl.c	xfs: xfs_ioctl: fix information leak to userland	2010-11-10 12:00:47 -06:00
xfs_ioctl.h	xfs: convert attr to use unsigned names	2010-01-20 10:47:48 +11:00
xfs_ioctl32.c	xfs: Extend project quotas to support 32bit project ids	2010-10-18 15:08:08 -05:00
xfs_ioctl32.h	xfs: Extend project quotas to support 32bit project ids	2010-10-18 15:08:08 -05:00
xfs_iops.c	xfs: use hlist_add_fake	2010-11-10 12:00:48 -06:00
xfs_iops.h	[XFS] add a FMODE flag to make XFS invisible I/O less hacky	2008-12-11 13:14:41 +11:00
xfs_linux.h	xfs: use wait queues directly for the log wait queues	2010-12-21 12:09:01 +11:00
xfs_quotaops.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-08-07 12:57:07 -07:00
xfs_stats.c	xfs: switch to seq_file	2009-09-15 12:29:24 -05:00
xfs_stats.h	[XFS] add new btree statistics	2008-10-30 16:55:03 +11:00
xfs_super.c	xfs: reduce the number of AIL push wakeups	2010-12-17 20:08:04 +11:00
xfs_super.h	xfs: remove xfs_version.h	2010-10-18 15:08:04 -05:00
xfs_sync.c	xfs: convert pag_ici_lock to a spin lock	2010-12-16 17:08:41 +11:00
xfs_sync.h	xfs: implement batched inode lookups for AG walking	2010-10-18 15:07:53 -05:00
xfs_sysctl.c	sysctl: Drop & in front of every proc_handler.	2009-11-18 08:37:40 -08:00
xfs_sysctl.h	[XFS] remove restricted chown parameter from xfs linux	2008-10-30 18:30:48 +11:00
xfs_trace.c	xfs: remove unneeded #include statements	2010-07-26 13:16:33 -05:00
xfs_trace.h	xfs: introduce new locks for the log grant ticket wait queues	2010-12-21 12:29:01 +11:00
xfs_vnode.h	xfs: event tracing support	2009-12-14 23:08:16 -06:00
xfs_xattr.c	xfs: constify xattr_handler	2010-05-21 18:31:19 -04:00