Linus Torvalds f3270b16e0 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (48 commits) ocfs2: Avoid to evaluate xattr block flags again. ocfs2/cluster: Release debugfs file elapsed_time_in_ms ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes. Initialize max_slots early When I tried to compile I got the following warning: fs/ocfs2/slot_map.c: In function ‘ocfs2_init_slot_info’: fs/ocfs2/slot_map.c:360: warning: ‘bytes’ may be used uninitialized in this function fs/ocfs2/slot_map.c:360: note: ‘bytes’ was declared here Compiler: gcc version 4.4.3 (GCC) on Mandriva I'm not sure why this warning occurs, I think compiler don't know that variable "bytes" is initialized when it is sent by reference to ocfs2_slot_map_physical_size and it throws that ugly warning. However, a simple initialization of "bytes" variable with 0 will fix it. ocfs2: validate bg_free_bits_count after update ocfs2/cluster: Bump up dlm protocol to version 1.1 ocfs2/cluster: Show per region heartbeat elapsed time ocfs2/cluster: Add mlogs for heartbeat up/down events ocfs2/cluster: Create debugfs dir/files for each region ocfs2/cluster: Create debugfs files for live, quorum and failed region bitmaps ocfs2/cluster: Maintain bitmap of failed regions ocfs2/cluster: Maintain bitmap of quorum regions ocfs2/cluster: Track bitmap of live heartbeat regions ocfs2/cluster: Track number of global heartbeat regions ocfs2/cluster: Maintain live node bitmap per heartbeat region ocfs2/cluster: Reorganize o2hb debugfs init ocfs2/cluster: Check slots for unconfigured live nodes ocfs2/cluster: Print messages when adding/removing nodes ocfs2/cluster: Print messages when adding/removing heartbeat regions ...		2010-10-21 19:01:34 -07:00
..
9p	fs/9p: Don't use dotl version of mknod for dotu inode operations	2010-09-13 08:13:03 -05:00
adfs	check ATTR_SIZE contraints in inode_change_ok	2010-08-09 16:47:39 -04:00
affs	affs: Use sema_init instead of init_MUTEX	2010-10-12 17:39:25 +02:00
afs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6	2010-08-13 10:37:30 -07:00
autofs	autofs/autofs4: Move compat_ioctl handling into fs	2010-08-09 00:13:34 +02:00
autofs4	autofs4: remove unneeded null check in try_to_fill_dentry()	2010-08-11 08:59:06 -07:00
befs	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
bfs	BFS: clean up the superblock usage	2010-08-09 16:48:53 -04:00
btrfs	Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block	2010-08-10 15:22:42 -07:00
cachefiles	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
ceph	ceph: do not carry i_lock for readdir from dcache	2010-10-20 15:38:27 -07:00
cifs	cifs: prevent infinite recursion in cifs_reconnect_tcon	2010-10-01 17:50:08 +00:00
coda	Coda: mount hangs because of missed REQ_WRITE rename	2010-09-19 11:03:09 -07:00
configfs	fix setattr error handling in sysfs, configfs	2010-06-04 17:16:29 -04:00
cramfs	cramfs: only unlock new inodes	2010-08-18 01:01:33 -04:00
debugfs	Add x64 support to debugfs	2010-05-19 22:41:57 -04:00
devpts	Simplify devpts_get_sb() failure exits	2010-05-21 18:31:12 -04:00
dlm	fs/dlm: Drop unnecessary null test	2010-08-05 14:23:45 -05:00
ecryptfs	eCryptfs: Fix encrypted file name lookup regression	2010-08-27 10:50:53 -05:00
efs	…
exofs	exofs: Fix double page_unlock BUG in write_begin/end	2010-10-08 11:26:54 -04:00
exportfs	…
ext2	mbcache: Remove unused features	2010-08-09 16:48:45 -04:00
ext3	ext3/ext4: Factor out disk addressability check	2010-09-10 08:41:42 -07:00
ext4	ext3/ext4: Factor out disk addressability check	2010-09-10 08:41:42 -07:00
fat	remove SWRITE* I/O types	2010-08-18 01:09:01 -04:00
freevxfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-08-10 11:26:52 -07:00
fscache	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
fuse	fuse: Initialize total_len in fuse_retrieve()	2010-10-04 10:45:32 +02:00
gfs2	GFS2: fixed typo	2010-10-18 14:38:07 +01:00
hfs	hfs: Convert tree_lock to mutex	2010-10-12 17:36:11 +02:00
hfsplus	hfsplus: fix getxattr return value	2010-10-15 05:45:00 -07:00
hostfs	hostfs ->follow_link() braino	2010-08-18 06:21:10 -04:00
hpfs	switch hpfs to ->evict_inode()	2010-08-09 16:48:17 -04:00
hppfs	switch hppfs to ->evict_inode()	2010-08-09 16:48:16 -04:00
hugetlbfs	new helper: end_writeback()	2010-08-09 16:47:49 -04:00
isofs	isofs: Fix lseek() to position beyond 4 GB	2010-08-11 00:29:47 -04:00
jbd	remove SWRITE* I/O types	2010-08-18 01:09:01 -04:00
jbd2	JBD2: Allow feature checks before journal recovery	2010-09-10 08:41:54 -07:00
jffs2	Merge git://git.infradead.org/mtd-2.6	2010-08-10 11:49:21 -07:00
jfs	jfs: don't allow os2 xattr namespace overlap with others	2010-08-10 15:33:09 -07:00
lockd	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
logfs	logfs: kill BKL	2010-08-14 00:24:24 +02:00
minix	minix: fix regression in minix_mkdir()	2010-09-09 18:57:25 -07:00
ncpfs	Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing	2010-08-10 13:58:28 -07:00
nfs	SUNRPC: Fix the NFSv4 and RPCSEC_GSS Kconfig dependencies	2010-09-12 19:57:50 -04:00
nfs_common	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
nfsd	nfsd: fix BUG at fs/nfsd/nfsfh.h:199 on unlink	2010-10-13 15:48:55 -04:00
nilfs2	nilfs2: fix leak of shadow dat inode in error path of load_nilfs	2010-08-30 10:18:03 +09:00
nls	…
notify	fanotify: disable fanotify syscalls	2010-10-11 18:15:28 -07:00
ntfs	convert remaining ->clear_inode() to ->evict_inode()	2010-08-09 16:48:37 -04:00
ocfs2	ocfs2: Avoid to evaluate xattr block flags again.	2010-10-15 13:03:43 -07:00
omfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs	2010-08-10 11:47:36 -07:00
openpromfs	…
partitions	[S390] partitions: fix build error in ibm partition detection code	2010-08-13 10:06:55 +02:00
proc	proc: make /proc/pid/limits world readable	2010-10-01 10:50:59 -07:00
qnx4	get rid of cont_write_begin_newtrunc	2010-08-09 16:47:31 -04:00
quota	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-08-10 11:26:52 -07:00
ramfs	check ATTR_SIZE contraints in inode_change_ok	2010-08-09 16:47:39 -04:00
reiserfs	reiserfs: fix unwanted reiserfs lock recursion	2010-10-01 10:50:59 -07:00
romfs	fix leak in romfs_fill_super()	2010-01-26 22:22:26 -05:00
smbfs	switch smbfs to evict_inode()	2010-08-09 16:48:00 -04:00
squashfs	Squashfs: fix checkpatch.pl warnings	2010-08-08 22:29:33 +00:00
sysfs	sysfs: Add sysfs_merge_group() and sysfs_unmerge_group()	2010-10-17 01:57:44 +02:00
sysv	fs/sysv/super.c: add support for non-PDP11 v7 filesystems	2010-08-11 08:59:23 -07:00
ubifs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-08-10 11:26:52 -07:00
udf	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-08-10 11:26:52 -07:00
ufs	remove SWRITE* I/O types	2010-08-18 01:09:01 -04:00
xfs	xfs: properly account for reclaimed inodes	2010-10-06 22:35:48 -05:00
Kconfig	fs/Kconfig: Fix typo Userpace -> Userspace	2010-07-20 17:30:22 +02:00
Kconfig.binfmt	…
Makefile	Take statfs variants to fs/statfs.c	2010-05-21 18:31:17 -04:00
aio.c	aio: do not return ERESTARTSYS as a result of AIO	2010-09-22 17:22:39 -07:00
anon_inodes.c	Revert "anon_inode: set S_IFREG on the anon_inode"	2010-05-27 22:03:05 -04:00
attr.c	check ATTR_SIZE contraints in inode_change_ok	2010-08-09 16:47:39 -04:00
bad_inode.c	bkl: Remove locked .ioctl file operation	2010-08-14 00:24:24 +02:00
binfmt_aout.c	Don't dump task struct in a.out core-dumps	2010-10-14 10:57:40 -07:00
binfmt_elf.c	ARM: 6342/1: fix ASLR of PIE executables	2010-10-08 10:02:53 +01:00
binfmt_elf_fdpic.c	binfmt_elf_fdpic: Fix clear_user() error handling	2010-06-01 08:11:06 -07:00
binfmt_em86.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
binfmt_flat.c	flat: tweak default stack alignment	2010-06-29 15:29:31 -07:00
binfmt_misc.c	binfmt_misc: fix binfmt_misc priority	2010-09-09 18:57:24 -07:00
binfmt_script.c	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07:00
binfmt_som.c	Split 'flush_old_exec' into two functions	2010-01-29 08:22:01 -08:00
bio-integrity.c	fs/bio-integrity.c: return -ENOMEM on kmalloc failure	2010-08-23 13:36:59 +02:00
bio.c	block: unify flags for struct bio and struct request	2010-08-07 18:20:39 +02:00
block_dev.c	blkdev: cgroup whitelist permission fix	2010-08-11 08:59:18 -07:00
buffer.c	remove SWRITE* I/O types	2010-08-18 01:09:01 -04:00
char_dev.c	char: Mark /dev/zero and /dev/kmem as not capable of writeback	2010-09-22 09:48:47 +02:00
compat.c	Prevent freeing uninitialized pointer in compat_do_readv_writev	2010-09-22 17:22:38 -07:00
compat_binfmt_elf.c	elf coredump: replace ELF_CORE_EXTRA_* macros by functions	2010-03-06 11:26:45 -08:00
compat_ioctl.c	bkl: Remove locked .ioctl file operation	2010-08-14 00:24:24 +02:00
dcache.c	fs: brlock vfsmount_lock	2010-08-18 08:35:48 -04:00
dcookies.c	…
direct-io.c	O_DIRECT: fix the splitting up of contiguous I/O	2010-09-09 18:57:22 -07:00
drop_caches.c	simplify checks for I_CLEAR/I_FREEING	2010-08-09 16:47:44 -04:00
eventfd.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
eventpoll.c	sched, wait: Use wrapper functions	2010-05-11 17:43:58 +02:00
exec.c	Export dump_{write,seek} to binary loader modules	2010-10-14 19:15:28 -07:00
fcntl.c	vfs: take O_NONBLOCK out of the O_* uniqueness test	2010-09-09 18:57:25 -07:00
fifo.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
file.c	vfs: use kmalloc() to allocate fdmem if possible	2010-08-11 08:59:02 -07:00
file_table.c	fs: scale files_lock	2010-08-18 08:35:48 -04:00
filesystems.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
fs-writeback.c	writeback: always use sb->s_bdi for writeback purposes	2010-10-04 14:25:33 +02:00
fs_struct.c	fs: fs_struct rwlock to spinlock	2010-08-18 08:35:46 -04:00
generic_acl.c	vfs: update ctime when changing the file's permission by setfacl	2010-08-18 01:04:22 -04:00
inode.c	Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify	2010-08-10 11:39:13 -07:00
internal.h	fs: brlock vfsmount_lock	2010-08-18 08:35:48 -04:00
ioctl.c	bkl: Remove locked .ioctl file operation	2010-08-14 00:24:24 +02:00
ioprio.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
libfs.c	libfs: Fix shift bug in generic_check_addressable()	2010-09-10 08:42:48 -07:00
locks.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mbcache.c	mbcache: Limit the maximum number of cache entries	2010-08-18 06:24:41 -04:00
mpage.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
namei.c	fs: brlock vfsmount_lock	2010-08-18 08:35:48 -04:00
namespace.c	VFS: Sanity check mount flags passed to change_mnt_propagation()	2010-09-07 13:46:20 -07:00
nfsctl.c	Switch may_open() and break_lease() to passing O_...	2010-03-03 13:00:21 -05:00
no-block.c	…
open.c	fs: cleanup files_lock locking	2010-08-18 08:35:47 -04:00
pipe.c	pipe: fix check in "set size" fcntl	2010-06-10 19:08:34 +02:00
pnode.c	fs: brlock vfsmount_lock	2010-08-18 08:35:48 -04:00
pnode.h	VFS: Clean up shared mount flag propagation	2010-03-03 14:07:55 -05:00
posix_acl.c	…
read_write.c	fsnotify: pass a file instead of an inode to open, read, and write	2010-07-28 09:58:32 -04:00
read_write.h	…
readdir.c	vfs: fix warning: 'dirent' is used uninitialized in this function	2010-08-09 20:45:05 -07:00
select.c	Add generic sys_old_select()	2010-03-12 15:52:32 -08:00
seq_file.c	seq_file: fix new kernel-doc warnings	2010-03-07 15:48:26 -08:00
signalfd.c	signalfd: fill in ssi_int for posix timers and message queues	2010-08-11 08:59:20 -07:00
splice.c	splice: fix misuse of SPLICE_F_NONBLOCK	2010-08-07 18:52:56 +02:00
stack.c	VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size	2009-12-17 10:58:17 -05:00
stat.c	Mark arguments to certain syscalls as being const	2010-08-13 16:53:13 -07:00
statfs.c	add f_flags to struct statfs(64)	2010-08-09 16:48:44 -04:00
super.c	fs: scale files_lock	2010-08-18 08:35:48 -04:00
sync.c	get rid of file_fsync()	2010-08-09 16:47:43 -04:00
timerfd.c	fs/timerfd.c: make use of wait_event_interruptible_locked_irq()	2010-05-20 13:21:42 -07:00
utimes.c	Mark arguments to certain syscalls as being const	2010-08-13 16:53:13 -07:00
xattr.c	fs: xattr_handler table should be const	2010-05-21 18:31:18 -04:00
xattr_acl.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