Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-next/fs/ocfs2
History
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
2011-03-28 13:03:31 -07:00
..
cluster
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
dlm
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
dlmfs
fs: change to new flag variable
2011-03-17 14:02:57 +01:00
acl.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
acl.h
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
alloc.c
ocfs2: Remove mlog(0) from fs/ocfs2/alloc.c
2011-02-22 08:21:10 +08:00
alloc.h
ocfs2: Remove unused truncate function from alloc.c
2011-01-07 18:03:00 -08:00
aops.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
aops.h
Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
2010-12-09 15:36:48 -08:00
blockcheck.c
ocfs2: Fix metaecc error messages
2010-09-08 14:25:53 +08:00
blockcheck.h
ocfs2: Add statistics for the checksum and ecc operations.
2009-06-03 19:15:36 -07:00
buffer_head_io.c
ocfs2: Remove masklog ML_UPTODATE.
2011-02-24 16:22:20 +08:00
buffer_head_io.h
ocfs2: Take the inode out of the metadata read/write paths.
2009-09-04 16:07:48 -07:00
dcache.c
ocfs2: fix d_revalidate oopsen on NFS exports
2011-03-10 03:45:07 -05:00
dcache.h
Track negative entries v3
2010-09-10 09:18:15 -07:00
dir.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
dir.h
ocfs2: Introduce dir free space list
2009-04-03 11:39:16 -07:00
dlmglue.c
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
2011-03-28 09:44:26 -07:00
dlmglue.h
ocfs2: Fix lockdep warning in reflink.
2010-09-10 09:19:06 -07:00
export.c
exportfs: Return the minimum required handle size
2011-03-14 09:15:28 -04:00
export.h
exportfs: make struct export_operations const
2007-10-22 08:13:21 -07:00
extent_map.c
ocfs2: Remove masklog ML_EXTENT_MAP.
2011-02-22 22:27:33 +08:00
extent_map.h
ocfs2: Return extent flags for xattr value tree.
2009-09-22 20:09:39 -07:00
file.c
ocfs2: Remove mlog(0) from fs/ocfs2/file.c
2011-02-22 22:14:41 +08:00
file.h
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
heartbeat.c
ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c
2011-02-23 21:17:39 +08:00
heartbeat.h
ocfs2: Move o2hb functionality into the stack glue.
2008-04-18 08:56:04 -07:00
inode.c
ocfs2: Remove masklog ML_INODE.
2011-02-22 22:24:57 +08:00
inode.h
Track negative entries v3
2010-09-10 09:18:15 -07:00
ioctl.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
ioctl.h
Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h
2010-03-02 14:10:20 -08:00
journal.c
ocfs2: Remove masklog ML_JOURNAL.
2011-02-24 14:15:35 +08:00
journal.h
ocfs2: Fix estimate of necessary credits for mkdir
2011-02-20 02:33:32 -08:00
Kconfig
ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
2011-01-16 21:22:40 +00:00
localalloc.c
ocfs2: Remove EXIT from masklog.
2011-03-07 16:43:21 +08:00
localalloc.h
ocfs2: increase the default size of local alloc windows
2010-05-05 18:18:07 -07:00
locks.c
ocfs2: remove INODE from unused files.
2011-02-21 11:18:23 +08:00
locks.h
ocfs2: POSIX file locks support
2008-10-13 13:57:57 -07:00
Makefile
fs: change to new flag variable
2011-03-17 14:02:57 +01:00
mmap.c
ocfs2: Remove FILE_IO from masklog.
2011-02-22 21:59:46 +08:00
mmap.h
…
namei.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
namei.h
ocfs2: Create reflinked file in orphan dir.
2009-09-22 20:09:48 -07:00
ocfs1_fs_compat.h
fs/: Spelling fixes
2008-02-03 17:33:42 +02:00
ocfs2_fs.h
ocfs2: Fix system inodes cache overflow.
2010-12-22 02:35:36 -08:00
ocfs2_ioctl.h
Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window
2010-10-15 13:03:09 -07:00
ocfs2_lockid.h
ocfs2: Add new refcount tree lock resource in dlmglue.
2009-09-22 20:09:28 -07:00
ocfs2_lockingver.h
ocfs2_dlmfs: Enable the use of user cluster stacks.
2010-02-26 15:41:18 -08:00
ocfs2_trace.h
ocfs2: Remove masklog ML_UPTODATE.
2011-02-24 16:22:20 +08:00
ocfs2.h
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
quota_global.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
quota_local.c
ocfs2: Remove mlog(0) from quota_local.c.
2011-02-23 22:12:48 +08:00
quota.h
ocfs2: use system_wq instead of ocfs2_quota_wq
2011-02-01 11:42:42 +01:00
refcounttree.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
refcounttree.h
Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2
2010-09-10 08:41:04 -07:00
reservations.c
ocfs2: Remove masklog ML_RESERVATIONS.
2011-02-23 22:10:56 +08:00
reservations.h
ocfs2: make ocfs2_adjust_resv_from_alloc simple.
2010-05-05 18:18:09 -07:00
resize.c
ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c
2011-02-22 08:24:01 +08:00
resize.h
[PATCH 2/2] ocfs2: Implement group add for online resize
2008-01-25 15:04:24 -08:00
slot_map.c
ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c
2011-02-22 22:29:08 +08:00
slot_map.h
ocfs2: De-magic the in-memory slot map.
2008-04-18 08:56:03 -07:00
stack_o2cb.c
ocfs2: Print message if user mounts without starting global heartbeat
2010-10-06 17:55:29 -07:00
stack_user.c
ocfs2_connection_find() returns pointer to bad structure
2010-11-18 15:41:41 -08:00
stackglue.c
ocfs2_dlmfs: Enable the use of user cluster stacks.
2010-02-26 15:41:18 -08:00
stackglue.h
ocfs2_dlmfs: Enable the use of user cluster stacks.
2010-02-26 15:41:18 -08:00
suballoc.c
ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c
2011-02-22 08:22:33 +08:00
suballoc.h
ocfs2: allow return of new inode block location before allocation of the inode
2010-09-08 14:25:59 +08:00
super.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
super.h
ocfs2: Wrap signal blocking in void functions.
2010-05-10 11:50:10 -07:00
symlink.c
ocfs2: Remove EXIT from masklog.
2011-03-07 16:43:21 +08:00
symlink.h
…
sysfile.c
ocfs2: Remove mlog(0) from fs/ocfs2/file.c
2011-02-22 22:14:41 +08:00
sysfile.h
…
uptodate.c
ocfs2: Remove masklog ML_UPTODATE.
2011-02-24 16:22:20 +08:00
uptodate.h
ocfs2: Pass struct ocfs2_caching_info to the journal functions.
2009-09-04 16:07:50 -07:00
ver.c
ocfs2: bump version number
2008-01-25 15:05:46 -08:00
ver.h
…
xattr.c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-03-28 13:03:31 -07:00
xattr.h
fs/vfs/security: pass last path component to LSM on inode creation
2011-02-01 11:12:29 -05:00