You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 03e4970c10 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: (39 commits) Treat writes as new when holes span across page boundaries fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS. ocfs2/dlm: Move kmalloc() outside the spinlock ocfs2: Make the left masklogs compat. ocfs2: Remove masklog ML_AIO. ocfs2: Remove masklog ML_UPTODATE. ocfs2: Remove masklog ML_BH_IO. ocfs2: Remove masklog ML_JOURNAL. ocfs2: Remove masklog ML_EXPORT. ocfs2: Remove masklog ML_DCACHE. ocfs2: Remove masklog ML_NAMEI. ocfs2: Remove mlog(0) from fs/ocfs2/dir.c ocfs2: remove NAMEI from symlink.c ocfs2: Remove masklog ML_QUOTA. ocfs2: Remove mlog(0) from quota_local.c. ocfs2: Remove masklog ML_RESERVATIONS. ocfs2: Remove masklog ML_XATTR. ocfs2: Remove masklog ML_SUPER. ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c ... Fix up trivial conflict in fs/ocfs2/super.c		14 years ago
..
cluster	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
dlm	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
dlmfs	fs: change to new flag variable	14 years ago
Kconfig	ocfs2: Make OCFS2_FS depend on CONFIGFS_FS	14 years ago
Makefile	fs: change to new flag variable	14 years ago
acl.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
acl.h	fs: provide rcu-walk aware permission i_ops	14 years ago
alloc.c	ocfs2: Remove mlog(0) from fs/ocfs2/alloc.c	14 years ago
alloc.h	ocfs2: Remove unused truncate function from alloc.c	14 years ago
aops.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
aops.h	…
blockcheck.c	…
blockcheck.h	…
buffer_head_io.c	ocfs2: Remove masklog ML_UPTODATE.	14 years ago
buffer_head_io.h	…
dcache.c	ocfs2: fix d_revalidate oopsen on NFS exports	14 years ago
dcache.h	…
dir.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
dir.h	…
dlmglue.c	Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix	14 years ago
dlmglue.h	…
export.c	exportfs: Return the minimum required handle size	14 years ago
export.h	…
extent_map.c	ocfs2: Remove masklog ML_EXTENT_MAP.	14 years ago
extent_map.h	…
file.c	ocfs2: Remove mlog(0) from fs/ocfs2/file.c	14 years ago
file.h	fs: provide rcu-walk aware permission i_ops	14 years ago
heartbeat.c	ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c	14 years ago
heartbeat.h	…
inode.c	ocfs2: Remove masklog ML_INODE.	14 years ago
inode.h	…
ioctl.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
ioctl.h	…
journal.c	ocfs2: Remove masklog ML_JOURNAL.	14 years ago
journal.h	ocfs2: Fix estimate of necessary credits for mkdir	14 years ago
localalloc.c	ocfs2: Remove EXIT from masklog.	14 years ago
localalloc.h	…
locks.c	ocfs2: remove INODE from unused files.	14 years ago
locks.h	…
mmap.c	ocfs2: Remove FILE_IO from masklog.	14 years ago
mmap.h	…
namei.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
namei.h	…
ocfs1_fs_compat.h	…
ocfs2.h	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
ocfs2_fs.h	…
ocfs2_ioctl.h	…
ocfs2_lockid.h	…
ocfs2_lockingver.h	…
ocfs2_trace.h	ocfs2: Remove masklog ML_UPTODATE.	14 years ago
quota.h	ocfs2: use system_wq instead of ocfs2_quota_wq	14 years ago
quota_global.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
quota_local.c	ocfs2: Remove mlog(0) from quota_local.c.	14 years ago
refcounttree.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
refcounttree.h	…
reservations.c	ocfs2: Remove masklog ML_RESERVATIONS.	14 years ago
reservations.h	…
resize.c	ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c	14 years ago
resize.h	…
slot_map.c	ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c	14 years ago
slot_map.h	…
stack_o2cb.c	…
stack_user.c	…
stackglue.c	…
stackglue.h	…
suballoc.c	ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c	14 years ago
suballoc.h	…
super.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
super.h	…
symlink.c	ocfs2: Remove EXIT from masklog.	14 years ago
symlink.h	…
sysfile.c	ocfs2: Remove mlog(0) from fs/ocfs2/file.c	14 years ago
sysfile.h	…
uptodate.c	ocfs2: Remove masklog ML_UPTODATE.	14 years ago
uptodate.h	…
ver.c	…
ver.h	…
xattr.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	14 years ago
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	14 years ago