Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6

2026-09-24 18:16:04 +00:00 · 2008-11-07 15:07:12 +11:00 · 2008-11-07 15:07:12 +11:00 · dcd7b4e5c0
commit dcd7b4e5c0
parent 75fa67706c 91b7771251
84 changed files with 8174 additions and 10256 deletions
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
--- a/fs/xfs/linux-2.6/xfs_globals.c
+++ b/fs/xfs/linux-2.6/xfs_globals.c
--- a/fs/xfs/linux-2.6/xfs_globals.h
+++ b/fs/xfs/linux-2.6/xfs_globals.h
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
--- a/fs/xfs/linux-2.6/xfs_stats.c
+++ b/fs/xfs/linux-2.6/xfs_stats.c
--- a/fs/xfs/linux-2.6/xfs_stats.h
+++ b/fs/xfs/linux-2.6/xfs_stats.h
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
--- a/fs/xfs/linux-2.6/xfs_sysctl.c
+++ b/fs/xfs/linux-2.6/xfs_sysctl.c
--- a/fs/xfs/linux-2.6/xfs_sysctl.h
+++ b/fs/xfs/linux-2.6/xfs_sysctl.h
--- a/fs/xfs/linux-2.6/xfs_vfs.h
+++ b/fs/xfs/linux-2.6/xfs_vfs.h
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
--- a/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/fs/xfs/linux-2.6/xfs_vnode.h
--- a/fs/xfs/quota/xfs_dquot.c
+++ b/fs/xfs/quota/xfs_dquot.c
--- a/fs/xfs/quota/xfs_dquot.h
+++ b/fs/xfs/quota/xfs_dquot.h
--- a/fs/xfs/quota/xfs_dquot_item.c
+++ b/fs/xfs/quota/xfs_dquot_item.c
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
--- a/fs/xfs/quota/xfs_qm.h
+++ b/fs/xfs/quota/xfs_qm.h
--- a/fs/xfs/quota/xfs_qm_bhv.c
+++ b/fs/xfs/quota/xfs_qm_bhv.c
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
--- a/fs/xfs/xfs_ag.h
+++ b/fs/xfs/xfs_ag.h
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
--- a/fs/xfs/xfs_alloc.h
+++ b/fs/xfs/xfs_alloc.h
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
--- a/fs/xfs/xfs_alloc_btree.h
+++ b/fs/xfs/xfs_alloc_btree.h
--- a/fs/xfs/xfs_arch.h
+++ b/fs/xfs/xfs_arch.h
--- a/fs/xfs/xfs_bit.h
+++ b/fs/xfs/xfs_bit.h
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
--- a/fs/xfs/xfs_bmap.h
+++ b/fs/xfs/xfs_bmap.h
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
--- a/fs/xfs/xfs_bmap_btree.h
+++ b/fs/xfs/xfs_bmap_btree.h
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
--- a/fs/xfs/xfs_btree.h
+++ b/fs/xfs/xfs_btree.h
--- a/fs/xfs/xfs_btree_trace.c
+++ b/fs/xfs/xfs_btree_trace.c
--- a/fs/xfs/xfs_btree_trace.h
+++ b/fs/xfs/xfs_btree_trace.h
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
--- a/fs/xfs/xfs_clnt.h
+++ b/fs/xfs/xfs_clnt.h
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
--- a/fs/xfs/xfs_da_btree.h
+++ b/fs/xfs/xfs_da_btree.h
--- a/fs/xfs/xfs_dinode.h
+++ b/fs/xfs/xfs_dinode.h
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
--- a/fs/xfs/xfs_ialloc.h
+++ b/fs/xfs/xfs_ialloc.h
--- a/fs/xfs/xfs_ialloc_btree.c
+++ b/fs/xfs/xfs_ialloc_btree.c
--- a/fs/xfs/xfs_ialloc_btree.h
+++ b/fs/xfs/xfs_ialloc_btree.h
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
--- a/fs/xfs/xfs_imap.h
+++ b/fs/xfs/xfs_imap.h
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
--- a/fs/xfs/xfs_trans_ail.c
+++ b/fs/xfs/xfs_trans_ail.c
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
--- a/fs/xfs/xfs_trans_priv.h
+++ b/fs/xfs/xfs_trans_priv.h
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
--- a/fs/xfs/xfs_vfsops.h
+++ b/fs/xfs/xfs_vfsops.h
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
--- a/fs/xfs/xfs_vnodeops.h
+++ b/fs/xfs/xfs_vnodeops.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c