This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, for-linus-merged has been updated
e677de4 Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus-merged
0e6e847 xfs: stop using the page cache to back the buffer cache
704b290 xfs: register the inode cache shrinker before quotachecks
7401aaf xfs: xfs_trans_read_buf() should return an error on failure
1bfd8d0 xfs: introduce inode cluster buffer trylocks for xfs_iflush
a19fb38 vmap: flush vmap aliases when mapping fails
8287889 xfs: preallocation transactions do not need to be synchronous
6c51038 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
3155fe6 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
a44f99c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
0ccd234 fs: change to new flag variable
0f6e0e8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
bd2895e Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
5fe0c23 exportfs: Return the minimum required handle size
0c9ba97 xfs: don't name variables "panic"
4c63f56 Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
721a960 block: kill off REQ_UNPLUG
7eaceac block: remove per-queue plugging
ecb6928 xfs: factor agf counter updates into a helper
86fa8af xfs: clean up the xfs_alloc_compute_aligned calling convention
fe3fa43 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
9130090 xfs: kill support/debug.[ch]
0b932cc xfs: Convert remaining cmn_err() callers to new API
8221112 xfs: convert the quota debug prints to new API
6d4a8ec xfs: rename xfs_cmn_err_fsblock_zero()
5348778 xfs: convert xfs_fs_cmn_err to new error logging API
af34e09 xfs: kill xfs_fs_mount_cmn_err() macro
65333b4 xfs: kill xfs_fs_repair_cmn_err() macro
6a19d93 xfs: convert xfs_cmn_err to xfs_alert_tag
a0fa2b6 xfs: Convert xlog_warn to new logging interface
4f10700 xfs: Convert linux-2.6/ files to new logging interface
af24ee9 xfs: zero proper structure size for geometry calls
10e3839 xfs: introduce new logging API.
eeb2036 xfs: zero proper structure size for geometry calls
20ad9ea xfs: enable delaylog by default
ec3ba85 xfs: more sensible inode refcounting for ialloc
1050c71 xfs: stop using xfs_trans_iget in the RT allocator
be71514 xfs: check if device support discard in xfs_ioc_trim()
3a3675b xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
5d15765 xfs: check if device support discard in xfs_ioc_trim()
c4d0c3b xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
43d133c Merge branch 'master' into for-2.6.39
9681153 xfs: add lockdep annotations for the rt inodes
0d8b30a xfs: fix xfs_get_extsz_hint for a zero extent size hint
04e9945 xfs: only lock the rt bitmap inode once per allocation
2a7dba3 fs/vfs/security: pass last path component to LSM on inode creation
83e7590 xfs: convert to alloc_workqueue()
24446fc xfs: xfs_bmap_add_extent_delay_real should init br_startblock
0fbca4d xfs: fix dquot shaker deadlock
c6f990d xfs: handle CIl transaction commit failures correctly
5315837 xfs: limit extsize to size of AGs and/or MAXEXTLEN
4ce1598 xfs: prevent extsize alignment from exceeding maximum extent size
14b064c xfs: limit extent length for allocation to AG size
b8fc826 xfs: speculative delayed allocation uses rounddown_power_of_2 badly
e34a314 xfs: fix efi item leak on forced shutdown
7db37c5 xfs: fix log ticket leak on forced shutdown.
cf78859 xfs: Do not name variables "panic"
2fe17c1 fallocate should be a file operation
64c23e8 make the feature checks in ->fallocate future proof
7cb3920 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
275220f Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
b2034d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
008d23e Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
c25d246 XFS: handle hole punching via fallocate properly
73efe4a xfs: prevent NMI timeouts in cmn_err
65a84a0 xfs: Add log level to assertion printk
1884bd8 xfs: fix an assignment within an ASSERT()
bfc6017 xfs: fix error handling for synchronous writes
a46db60 xfs: add FITRIM support
c58efdb xfs: ensure log covering transactions are synchronous
eda7798 xfs: serialise unaligned direct IOs
4d8d158 xfs: factor common write setup code
637bbc7 xfs: split buffered IO write path from xfs_file_aio_write
f0d26e8 xfs: split direct IO write path from xfs_file_aio_write
487f84f xfs: introduce xfs_rw_lock() helpers for locking the inode
4c5cfd1 xfs: factor post-write newsize updates
edafb6d xfs: factor common post-write isize handling code
a363f0c xfs: ensure sync write errors are returned
4b7bd36 Merge branch 'master' into for-next
f30195c Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core
d4d7762 block: clean up blkdev_get() wrappers and their users
e525fd8 block: make blkdev_get/put() handle exclusive access
b595076 tree-wide: fix comment/printk typos
from 92f1c008ae79e32b83c0607d184b194f302bb3ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e677de452c3d08daaca53cfb128a357ac64ad848
Merge: 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 0e6e847ffe37436e331c132639f9f872febce82e
Author: Alex Elder <aelder@xxxxxxx>
Date: Mon Mar 28 11:23:56 2011 -0500
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus-merged
Merge the content of the XFS master branch into Linus' current
master. Fix the conflicts that arise due to Jens Axboe's recent
on-stack queue plugging (in "fs/xfs/linux-2.6/xfs_buf.c").
commit 6c5103890057b1bb781b26b7aae38d33e4c517d8
Merge: 3dab04e6978e358ad2307bca563fabd6c5d2c58b 9d2e157d970a73b3f270b631828e03eb452d525e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Mar 24 10:16:26 2011 -0700
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
Documentation/iostats.txt: bit-size reference etc.
cfq-iosched: removing unnecessary think time checking
cfq-iosched: Don't clear queue stats when preempt.
blk-throttle: Reset group slice when limits are changed
blk-cgroup: Only give unaccounted_time under debug
cfq-iosched: Don't set active queue in preempt
block: fix non-atomic access to genhd inflight structures
block: attempt to merge with existing requests on plug flush
block: NULL dereference on error path in __blkdev_get()
cfq-iosched: Don't update group weights when on service tree
fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
block: Require subsystems to explicitly allocate bio_set integrity mempool
jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
fs: make fsync_buffers_list() plug
mm: make generic_writepages() use plugging
blk-cgroup: Add unaccounted time to timeslice_used.
block: fixup plugging stubs for !CONFIG_BLOCK
block: remove obsolete comments for blkdev_issue_zeroout.
blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
...
Fix up conflicts in fs/{aio.c,super.c}
commit 3155fe6df553472fd7c07e7788b0e542cd828c91
Merge: da48524eb20662618854bb3df2db01fc65f3070c 0c9ba97318fc9a905bcc1419b6966de061203a70
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Mar 21 14:24:56 2011 -0700
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
xfs: don't name variables "panic"
xfs: factor agf counter updates into a helper
xfs: clean up the xfs_alloc_compute_aligned calling convention
xfs: kill support/debug.[ch]
xfs: Convert remaining cmn_err() callers to new API
xfs: convert the quota debug prints to new API
xfs: rename xfs_cmn_err_fsblock_zero()
xfs: convert xfs_fs_cmn_err to new error logging API
xfs: kill xfs_fs_mount_cmn_err() macro
xfs: kill xfs_fs_repair_cmn_err() macro
xfs: convert xfs_cmn_err to xfs_alert_tag
xfs: Convert xlog_warn to new logging interface
xfs: Convert linux-2.6/ files to new logging interface
xfs: introduce new logging API.
xfs: zero proper structure size for geometry calls
xfs: enable delaylog by default
xfs: more sensible inode refcounting for ialloc
xfs: stop using xfs_trans_iget in the RT allocator
xfs: check if device support discard in xfs_ioc_trim()
xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
...
commit a44f99c7efdb88fa41128065c9a9445c19894e34
Merge: b87a2d3e3147bd140da2eae584772c353d11421b 22942c00a6ad6e9e93b53811a6de72c821c15d22
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Mar 20 18:14:55 2011 -0700
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
video: change to new flag variable
scsi: change to new flag variable
rtc: change to new flag variable
rapidio: change to new flag variable
pps: change to new flag variable
net: change to new flag variable
misc: change to new flag variable
message: change to new flag variable
memstick: change to new flag variable
isdn: change to new flag variable
ieee802154: change to new flag variable
ide: change to new flag variable
hwmon: change to new flag variable
dma: change to new flag variable
char: change to new flag variable
fs: change to new flag variable
xtensa: change to new flag variable
um: change to new flag variables
s390: change to new flag variable
mips: change to new flag variable
...
Fix up trivial conflict in drivers/hwmon/Makefile
commit 0ccd234ca04b09a156f8771af316ac9de2fa7312
Author: matt mooney <mfm@xxxxxxxxxxxxx>
Date: Fri Jan 14 06:12:35 2011 -0800
fs: change to new flag variable
Replace EXTRA_CFLAGS with ccflags-y. And change ntfs-objs to ntfs-y
for cleaner conditional inclusion.
Signed-off-by: matt mooney <mfm@xxxxxxxxxxxxx>
Acked-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
commit 0f6e0e8448a16d8d22119ce91d8dd24b44865b51
Merge: 0d2ecee2bdb2a19d04bc5cefac0f86e790f1aad4 a002951c97ff8da49938c982a4c236bf2fafdc9f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Mar 16 09:15:43 2011 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits)
AppArmor: kill unused macros in lsm.c
AppArmor: cleanup generated files correctly
KEYS: Add an iovec version of KEYCTL_INSTANTIATE
KEYS: Add a new keyctl op to reject a key with a specified error code
KEYS: Add a key type op to permit the key description to be vetted
KEYS: Add an RCU payload dereference macro
AppArmor: Cleanup make file to remove cruft and make it easier to read
SELinux: implement the new sb_remount LSM hook
LSM: Pass -o remount options to the LSM
SELinux: Compute SID for the newly created socket
SELinux: Socket retains creator role and MLS attribute
SELinux: Auto-generate security_is_socket_class
TOMOYO: Fix memory leak upon file open.
Revert "selinux: simplify ioctl checking"
selinux: drop unused packet flow permissions
selinux: Fix packet forwarding checks on postrouting
selinux: Fix wrong checks for selinux_policycap_netpeer
selinux: Fix check for xfrm selinux context algorithm
ima: remove unnecessary call to ima_must_measure
IMA: remove IMA imbalance checking
...
commit bd2895eeade5f11f3e5906283c630bbdb4b57454
Merge: 016aa2ed1cc9cf704cf76d8df07751b6daa9750f 24d51add7438f9696a7205927bf9de3c5c787a58
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Mar 16 08:20:19 2011 -0700
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: fix build failure introduced by s/freezeable/freezable/
workqueue: add system_freezeable_wq
rds/ib: use system_wq instead of rds_ib_fmr_wq
net/9p: replace p9_poll_task with a work
net/9p: use system_wq instead of p9_mux_wq
xfs: convert to alloc_workqueue()
reiserfs: make commit_wq use the default concurrency level
ocfs2: use system_wq instead of ocfs2_quota_wq
ext4: convert to alloc_workqueue()
scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path
scsi/be2iscsi,qla2xxx: convert to alloc_workqueue()
misc/iwmc3200top: use system_wq instead of dedicated workqueues
i2o: use alloc_workqueue() instead of create_workqueue()
acpi: kacpi*_wq don't need WQ_MEM_RECLAIM
fs/aio: aio_wq isn't used in memory reclaim path
input/tps6507x-ts: use system_wq instead of dedicated workqueue
cpufreq: use system_wq instead of dedicated workqueues
wireless/ipw2x00: use system_wq instead of dedicated workqueues
arm/omap: use system_wq in mailbox
workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER
commit 5fe0c2378884e68beb532f5890cc0e3539ac747b
Author: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Date: Sat Jan 29 18:43:25 2011 +0530
exportfs: Return the minimum required handle size
The exportfs encode handle function should return the minimum required
handle size. This helps user to find out the handle size by passing 0
handle size in the first step and then redoing to the call again with
the returned handle size value.
Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 4c63f5646e405b5010cc9499419060bf2e838f5b
Merge: cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 69d60eb96ae8a73cf9b79cf28051caf973006011
Author: Jens Axboe <jaxboe@xxxxxxxxxxxx>
Date: Thu Mar 10 08:58:35 2011 +0100
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit 721a9602e6607417c6bc15b18e97a2f35266c690
Author: Jens Axboe <jaxboe@xxxxxxxxxxxx>
Date: Wed Mar 9 11:56:30 2011 +0100
block: kill off REQ_UNPLUG
With the plugging now being explicitly controlled by the
submitter, callers need not pass down unplugging hints
to the block layer. If they want to unplug, it's because they
manually plugged on their own - in which case, they should just
unplug at will.
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit 7eaceaccab5f40bbfda044629a6298616aeaed50
Author: Jens Axboe <jaxboe@xxxxxxxxxxxx>
Date: Thu Mar 10 08:52:07 2011 +0100
block: remove per-queue plugging
Code has been converted over to the new explicit on-stack plugging,
and delay users have been converted to use the new API for that.
So lets kill off the old plugging along with aops->sync_page().
Signed-off-by: Jens Axboe <jaxboe@xxxxxxxxxxxx>
commit fe3fa43039d47ee4e22caf460b79b62a14937f79
Merge: ee009e4a0d4555ed522a631bae9896399674f064 026eb167ae77244458fa4b4b9fc171209c079ba7
Author: James Morris <jmorris@xxxxxxxxx>
Date: Tue Mar 8 11:38:10 2011 +1100
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
commit af24ee9ea8d532e16883251a6684dfa1be8eec29
Author: Alex Elder <aelder@xxxxxxx>
Date: Tue Mar 1 17:50:00 2011 +0000
xfs: zero proper structure size for geometry calls
Commit 493f3358cb289ccf716c5a14fa5bb52ab75943e5 added this call to
xfs_fs_geometry() in order to avoid passing kernel stack data back
to user space:
+ memset(geo, 0, sizeof(*geo));
Unfortunately, one of the callers of that function passes the
address of a smaller data type, cast to fit the type that
xfs_fs_geometry() requires. As a result, this can happen:
Kernel panic - not syncing: stack-protector: Kernel stack is corrupted
in: f87aca93
Pid: 262, comm: xfs_fsr Not tainted 2.6.38-rc6-493f3358cb2+ #1
Call Trace:
[<c12991ac>] ? panic+0x50/0x150
[<c102ed71>] ? __stack_chk_fail+0x10/0x18
[<f87aca93>] ? xfs_ioc_fsgeometry_v1+0x56/0x5d [xfs]
Fix this by fixing that one caller to pass the right type and then
copy out the subset it is interested in.
Note: This patch is an alternative to one originally proposed by
Eric Sandeen.
Reported-by: Jeffrey Hundstad <jeffrey.hundstad@xxxxxxxx>
Signed-off-by: Alex Elder <aelder@xxxxxxx>
Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>
Tested-by: Jeffrey Hundstad <jeffrey.hundstad@xxxxxxxx>
commit be715140b5c3baf8ab6708060cfab80bef279d18
Author: Lukas Czerner <lczerner@xxxxxxxxxx>
Date: Tue Feb 15 17:07:36 2011 +0000
xfs: check if device support discard in xfs_ioc_trim()
Right now we, are relying on the fact that when we attempt to
actually do the discard, blkdev_issue_discar() returns -EOPNOTSUPP
and the user is informed that the device does not support discard.
However, in the case where the we do not hit any suitable free
extent to trim in FITRIM code, it will finish without any error.
This is very confusing, because it seems that FITRIM was successful
even though the device does not actually supports discard.
Solution: Check for the discard support before attempt to search for
free extents.
Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
Signed-off-by: Alex Elder <aelder@xxxxxxx>
commit 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date: Mon Feb 14 13:45:28 2011 +0000
xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
The FSGEOMETRY_V1 ioctl (and its compat equivalent) calls out to
xfs_fs_geometry() with a version number of 3. This code path does not
fill in the logsunit member of the passed xfs_fsop_geom_t, leading to
the leaking of four bytes of uninitialized stack data to potentially
unprivileged callers.
v2 switches to memset() to avoid future issues if structure members
change, on suggestion of Dave Chinner.
Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Reviewed-by: Eugene Teo <eugeneteo@xxxxxxxxxx>
Signed-off-by: Alex Elder <aelder@xxxxxxx>
commit 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81
Merge: 4149efb22da66e326fc48baf80d628834509f7f0 6f576d57f1fa0d6026b495d8746d56d949989161
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Mon Feb 21 09:43:56 2011 +0100
Merge branch 'master' into for-2.6.39
commit 2a7dba391e5628ad665ce84ef9a6648da541ebab
Author: Eric Paris <eparis@xxxxxxxxxx>
Date: Tue Feb 1 11:05:39 2011 -0500
fs/vfs/security: pass last path component to LSM on inode creation
SELinux would like to implement a new labeling behavior of newly created
inodes. We currently label new inodes based on the parent and the creating
process. This new behavior would also take into account the name of the
new object when deciding the new label. This is not the (supposed) full path,
just the last component of the path.
This is very useful because creating /etc/shadow is different than creating
/etc/passwd but the kernel hooks are unable to differentiate these
operations. We currently require that userspace realize it is doing some
difficult operation like that and than userspace jumps through SELinux hoops
to get things set up correctly. This patch does not implement new
behavior, that is obviously contained in a seperate SELinux patch, but it
does pass the needed name down to the correct LSM hook. If no such name
exists it is fine to pass NULL.
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
commit 83e759043abe9d0291f58f2427ba12bbb0a6e4f1
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Tue Feb 1 11:42:43 2011 +0100
xfs: convert to alloc_workqueue()
Convert from create[_singlethread]_workqueue() to alloc_workqueue().
* xfsdatad_workqueue and xfsconvertd_workqueue are identity converted.
Using higher concurrency limit might be useful but given the
complexity of workqueue usage in xfs, proceeding cautiously seems
better.
* xfs_mru_reap_wq is converted to non-ordered workqueue with max
concurrency of 1 as the work items don't require any specific
ordering and already have proper synchronization. It seems it was
singlethreaded to save worker threads, which is no longer a concern.
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Alex Elder <aelder@xxxxxxx>
Cc: xfs-masters@xxxxxxxxxxx
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
-----------------------------------------------------------------------
Summary of changes:
fs/xfs/Makefile | 13 +-
fs/xfs/linux-2.6/kmem.c | 9 +-
fs/xfs/linux-2.6/xfs_aops.c | 10 +-
fs/xfs/linux-2.6/xfs_buf.c | 386 +++++++-------------------
fs/xfs/linux-2.6/xfs_buf.h | 47 +---
fs/xfs/linux-2.6/xfs_discard.c | 193 +++++++++++++
fs/xfs/linux-2.6/xfs_discard.h | 8 +
fs/xfs/linux-2.6/xfs_export.c | 4 +-
fs/xfs/linux-2.6/xfs_file.c | 591 +++++++++++++++++++++++++---------------
fs/xfs/linux-2.6/xfs_ioctl.c | 38 +++-
fs/xfs/linux-2.6/xfs_iops.c | 63 +----
fs/xfs/linux-2.6/xfs_linux.h | 23 ++-
fs/xfs/linux-2.6/xfs_message.c | 133 +++++++++
fs/xfs/linux-2.6/xfs_message.h | 38 +++
fs/xfs/linux-2.6/xfs_super.c | 173 ++++++------
fs/xfs/linux-2.6/xfs_sync.c | 46 +++-
fs/xfs/linux-2.6/xfs_sysctl.c | 25 ++-
fs/xfs/linux-2.6/xfs_trace.h | 33 +++
fs/xfs/quota/xfs_dquot.c | 48 ++--
fs/xfs/quota/xfs_dquot_item.c | 5 +-
fs/xfs/quota/xfs_qm.c | 95 +++----
fs/xfs/quota/xfs_qm_bhv.c | 3 +-
fs/xfs/quota/xfs_qm_syscalls.c | 85 +++---
fs/xfs/quota/xfs_trans_dquot.c | 5 +-
fs/xfs/support/debug.c | 115 --------
fs/xfs/support/debug.h | 54 ----
fs/xfs/xfs_alloc.c | 168 ++++++------
fs/xfs/xfs_alloc.h | 41 +++-
fs/xfs/xfs_bmap.c | 85 ++++--
fs/xfs/xfs_buf_item.c | 172 ++++--------
fs/xfs/xfs_da_btree.c | 9 +-
fs/xfs/xfs_dfrag.c | 4 +-
fs/xfs/xfs_dir2.c | 2 +-
fs/xfs/xfs_dir2_node.c | 25 +-
fs/xfs/xfs_error.c | 53 +---
fs/xfs/xfs_error.h | 29 +--
fs/xfs/xfs_extfree_item.c | 3 +-
fs/xfs/xfs_fsops.c | 19 +-
fs/xfs/xfs_fsops.h | 2 +-
fs/xfs/xfs_ialloc.c | 82 +++----
fs/xfs/xfs_inode.c | 131 ++++-----
fs/xfs/xfs_inode.h | 23 +-
fs/xfs/xfs_inode_item.c | 6 +-
fs/xfs/xfs_iomap.c | 19 +-
fs/xfs/xfs_log.c | 124 ++++-----
fs/xfs/xfs_log.h | 2 +-
fs/xfs/xfs_log_cil.c | 15 +-
fs/xfs/xfs_log_priv.h | 4 -
fs/xfs/xfs_log_recover.c | 223 ++++++++--------
fs/xfs/xfs_mount.c | 148 +++++-----
fs/xfs/xfs_mru_cache.c | 2 +-
fs/xfs/xfs_quota.h | 3 +-
fs/xfs/xfs_rtalloc.c | 92 +++----
fs/xfs/xfs_rtalloc.h | 2 +-
fs/xfs/xfs_rw.c | 58 ++---
fs/xfs/xfs_trans.c | 43 ++-
fs/xfs/xfs_trans.h | 2 -
fs/xfs/xfs_trans_ail.c | 2 +-
fs/xfs/xfs_trans_buf.c | 9 +-
fs/xfs/xfs_trans_inode.c | 22 --
fs/xfs/xfs_vnodeops.c | 77 ++----
fs/xfs/xfs_vnodeops.h | 1 +
62 files changed, 2001 insertions(+), 1944 deletions(-)
create mode 100644 fs/xfs/linux-2.6/xfs_discard.c
create mode 100644 fs/xfs/linux-2.6/xfs_discard.h
create mode 100644 fs/xfs/linux-2.6/xfs_message.c
create mode 100644 fs/xfs/linux-2.6/xfs_message.h
delete mode 100644 fs/xfs/support/debug.c
delete mode 100644 fs/xfs/support/debug.h
hooks/post-receive
--
XFS development tree
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
