Linus Torvalds ae005cbed1 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 ... * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits) ext4: fix a BUG in mb_mark_used during trim. ext4: unused variables cleanup in fs/ext4/extents.c ext4: remove redundant set_buffer_mapped() in ext4_da_get_block_prep() ext4: add more tracepoints and use dev_t in the trace buffer ext4: don't kfree uninitialized s_group_info members ext4: add missing space in printk's in __ext4_grp_locked_error() ext4: add FITRIM to compat_ioctl. ext4: handle errors in ext4_clear_blocks() ext4: unify the ext4_handle_release_buffer() api ext4: handle errors in ext4_rename jbd2: add COW fields to struct jbd2_journal_handle jbd2: add the b_cow_tid field to journal_head struct ext4: Initialize fsync transaction ids in ext4_new_inode() ext4: Use single thread to perform DIO unwritten convertion ext4: optimize ext4_bio_write_page() when no extent conversion is needed ext4: skip orphan cleanup if fs has unknown ROCOMPAT features ext4: use the nblocks arg to ext4_truncate_restart_trans() ext4: fix missing iput of root inode for some mount error paths ext4: make FIEMAP and delayed allocation play well together ext4: suppress verbose debugging information if malloc-debug is off ... Fi up conflicts in fs/ext4/super.c due to workqueue changes		2011-03-25 09:57:41 -07:00
..
caching	fscache: convert object to use workqueue instead of slow-work	2010-07-22 22:58:34 +02:00
configfs	Documentation: make configfs example code simpler, clearer	2010-11-18 15:00:46 -08:00
nfs	NFSv4.1: lseg documentation	2011-03-11 15:38:43 -05:00
pohmelfs	Staging: Pohmelfs: Added IO permissions and priorities.	2009-04-17 11:06:30 -07:00
9p.txt	fs/9p: Add access = client option to opt in acl evaluation.	2010-10-28 09:08:46 -05:00
00-INDEX	smbfs: move to drivers/staging	2010-10-05 09:08:21 -07:00
adfs.txt	adfs: add hexadecimal filetype suffix option	2011-03-22 17:44:17 -07:00
affs.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
afs.txt	AFS: Documentation updates	2009-08-19 10:40:13 -07:00
autofs4-mount-control.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
automount-support.txt
befs.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
bfs.txt	remove mention of CONFIG_KMOD from documentation	2008-07-22 19:24:29 +10:00
btrfs.txt	Btrfs: Add Documentation/filesystem/btrfs.txt, remove old COPYING	2009-01-07 09:54:24 -05:00
ceph.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
cifs.txt
coda.txt
cramfs.txt
debugfs.txt	Document the debugfs API	2009-06-06 10:28:14 -06:00
devpts.txt	Document usage of multiple-instances of devpts	2009-01-02 10:19:36 -08:00
directory-locking	Documentation: Fix up docs still talking about i_sem	2007-05-24 10:16:17 -07:00
dlmfs.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
dnotify_test.c	Documentation/fs/: split txt and source files	2010-03-12 15:52:35 -08:00
dnotify.txt	Documentation/fs/: split txt and source files	2010-03-12 15:52:35 -08:00
ecryptfs.txt	eCryptfs: Move ecryptfs docs into Documentation/filesystems/	2007-07-17 10:23:08 -07:00
exofs.txt	exofs: Add option to mount by osdname	2011-03-15 15:02:51 +02:00
ext2.txt	Doc fix: ext2 can only have 32,000 subdirs, not 32,768	2009-06-18 13:03:44 -07:00
ext3.txt	ext3: make barrier options consistent with ext4	2010-05-21 19:30:41 +02:00
ext4.txt	ext4: update ext4 documentation	2011-02-21 20:16:21 -05:00
fiemap.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
files.txt	fix f_count description in Documentation/filesystems/files.txt	2008-12-31 18:07:42 -05:00
fuse.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
gfs2-glocks.txt	GFS2: Update docs	2009-05-19 10:23:23 +01:00
gfs2-uevents.txt	GFS2: Add a document explaining GFS2's uevents	2009-08-17 11:11:41 +01:00
gfs2.txt	GFS2: docs update	2010-03-29 14:28:52 +01:00
hfs.txt
hfsplus.txt	Documentation: document HFSPlus	2007-07-31 15:39:38 -07:00
hpfs.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
inotify.txt
isofs.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
jfs.txt
Locking	fs: remove inode_lock from iput_final and prune_icache	2011-03-24 21:16:32 -04:00
locks.txt	Documentation: move locks.txt in filesystems/	2007-10-09 18:32:45 -04:00
logfs.txt	fix "seperate" typos in comments	2010-05-10 11:56:30 +02:00
Makefile	Documentation/fs/: split txt and source files	2010-03-12 15:52:35 -08:00
mandatory-locking.txt	locks: add warning about mandatory locking races	2007-10-09 18:32:45 -04:00
ncpfs.txt	ncpfs: remove dead URL from documentation	2009-09-23 07:39:42 -07:00
nilfs2.txt	nilfs2: add nodiscard mount option	2010-07-23 10:02:12 +09:00
ntfs.txt	NTFS: Fix invalid pointer dereference in ntfs_mft_record_alloc().	2011-01-31 12:58:11 +10:00
ocfs2.txt	ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.	2010-10-11 14:14:55 -07:00
omfs.txt	omfs: add filesystem documentation	2008-07-26 12:00:05 -07:00
path-lookup.txt	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
porting	fs: remove inode_lock from iput_final and prune_icache	2011-03-24 21:16:32 -04:00
proc.txt	oom: allow a non-CAP_SYS_RESOURCE proces to oom_score_adj down	2011-01-13 17:32:35 -08:00
quota.txt	quota: documentation for sending "below quota" messages via netlink and tiny doc update	2008-08-12 16:07:27 -07:00
ramfs-rootfs-initramfs.txt	Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix	2008-11-30 11:40:56 -08:00
relay.txt	relay: add buffer-only channels; useful for early logging	2008-07-26 12:00:04 -07:00
romfs.txt	Documentation/filesystems/romfs.txt: fixing link to genromfs	2011-02-17 22:04:46 +01:00
seq_file.txt	seq_file: use proc_create() in documentation	2009-12-16 07:20:07 -08:00
sharedsubtree.txt	Documentation: Fix trivial typo in filesystems/sharedsubtree.txt	2010-10-25 21:18:21 -04:00
spufs.txt
squashfs.txt	Squashfs: Update documentation to include compression options	2011-02-28 18:35:36 +00:00
sysfs-pci.txt	PCI: Allow read/write access to sysfs I/O port resources	2010-07-30 09:32:08 -07:00
sysfs-tagging.txt	sysfs-namespaces: add a high-level Documentation file	2010-05-21 09:37:31 -07:00
sysfs.txt	docs/sysfs: show() methods should use scnprintf().	2011-02-03 15:10:18 -08:00
sysv-fs.txt
tmpfs.txt	mempolicy: document cpuset interaction with tmpfs mpol mount option	2010-05-25 08:06:57 -07:00
ubifs.txt	UBIFS: do not check data crc by default	2011-03-11 10:52:07 +02:00
udf.txt	udf: implement mode and dmode mounting options	2009-04-02 12:29:50 +02:00
ufs.txt
vfat.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
vfs.txt	fs: remove inode_lock from iput_final and prune_icache	2011-03-24 21:16:32 -04:00
xfs-delayed-logging-design.txt	xfs: enable delaylog by default	2011-02-22 20:33:25 -06:00
xfs.txt	xfs: remove obsolete osyncisosync mount option	2010-07-26 13:16:51 -05:00
xip.txt	DOC: update xip method info	2008-11-12 17:17:17 -08:00