1
0
Fork 0
alistair23-linux/fs/nilfs2
Linus Torvalds 0f2cc4ecd8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  init: Open /dev/console from rootfs
  mqueue: fix typo "failues" -> "failures"
  mqueue: only set error codes if they are really necessary
  mqueue: simplify do_open() error handling
  mqueue: apply mathematics distributivity on mq_bytes calculation
  mqueue: remove unneeded info->messages initialization
  mqueue: fix mq_open() file descriptor leak on user-space processes
  fix race in d_splice_alias()
  set S_DEAD on unlink() and non-directory rename() victims
  vfs: add NOFOLLOW flag to umount(2)
  get rid of ->mnt_parent in tomoyo/realpath
  hppfs can use existing proc_mnt, no need for do_kern_mount() in there
  Mirror MS_KERNMOUNT in ->mnt_flags
  get rid of useless vfsmount_lock use in put_mnt_ns()
  Take vfsmount_lock to fs/internal.h
  get rid of insanity with namespace roots in tomoyo
  take check for new events in namespace (guts of mounts_poll()) to namespace.c
  Don't mess with generic_permission() under ->d_lock in hpfs
  sanitize const/signedness for udf
  nilfs: sanitize const/signedness in dealing with ->d_name.name
  ...

Fix up fairly trivial (famous last words...) conflicts in
drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c
2010-03-04 08:15:33 -08:00
..
Kconfig Revert "task_struct: make journal_info conditional" 2009-12-17 13:23:24 -08:00
Makefile nilfs2: update makefile and Kconfig 2009-04-07 08:31:16 -07:00
alloc.c nilfs2: insert cache operation in palloc get block routines 2009-11-20 10:05:51 +09:00
alloc.h nilfs2: add cache framework for persistent object allocator 2009-11-20 10:05:50 +09:00
bmap.c nilfs2: trivial coding style fix 2009-12-25 13:01:50 +09:00
bmap.h nilfs2: convert nilfs_bmap_lookup to an inline function 2009-09-14 18:27:16 +09:00
bmap_union.h nilfs2: integrated block mapping 2009-04-07 08:31:13 -07:00
btnode.c nilfs2: eliminate nilfs_btnode_get function 2009-11-20 10:05:50 +09:00
btnode.h nilfs2: eliminate nilfs_btnode_get function 2009-11-20 10:05:50 +09:00
btree.c nilfs2: use list_splice_tail or list_splice_tail_init 2009-11-29 02:50:46 +09:00
btree.h nilfs2: move definition of struct nilfs_btree_node 2009-11-20 10:05:46 +09:00
cpfile.c nilfs2: trivial coding style fix 2009-12-25 13:01:50 +09:00
cpfile.h nilfs2: separate read method of meta data files on super root block 2009-11-20 10:05:48 +09:00
dat.c nilfs2: delete unnecessary condition in nilfs_dat_translate 2010-02-13 12:26:03 +09:00
dat.h nilfs2: separate read method of meta data files on super root block 2009-11-20 10:05:48 +09:00
dir.c nilfs: sanitize const/signedness in dealing with ->d_name.name 2010-03-03 14:07:58 -05:00
direct.c nilfs2: trivial coding style fix 2009-12-25 13:01:50 +09:00
direct.h nilfs2: remove nilfs_direct_operations from direct mapping 2009-06-10 23:41:11 +09:00
file.c const: constify remaining file_operations 2009-10-01 16:11:11 -07:00
gcdat.c nilfs2: flush palloc cache before manipulating data pages of GC dat 2009-11-20 10:05:50 +09:00
gcinode.c nilfs2: remove newblk argument from nilfs_btnode_submit_block 2009-11-20 10:05:50 +09:00
ifile.c nilfs2: add palloc cache to ifile 2009-11-20 10:05:50 +09:00
ifile.h nilfs2: separate constructor of metadata files 2009-11-20 10:05:48 +09:00
inode.c nilfs2: replace mark_inode_dirty as nilfs_mark_inode_dirty 2009-11-27 20:05:16 +09:00
ioctl.c nilfs2: add reader's lock for cno in nilfs_ioctl_sync 2010-02-20 21:18:19 +09:00
mdt.c nilfs2: add cache framework for persistent object allocator 2009-11-20 10:05:50 +09:00
mdt.h nilfs2: add cache framework for persistent object allocator 2009-11-20 10:05:50 +09:00
namei.c nilfs really shouldn't slap struct dentry on stack... 2010-03-03 14:07:58 -05:00
nilfs.h nilfs really shouldn't slap struct dentry on stack... 2010-03-03 14:07:58 -05:00
page.c nilfs2: ensure to clear dirty state when deleting metadata file block 2009-05-10 17:04:42 +09:00
page.h nilfs2: buffer and page operations 2009-04-07 08:31:13 -07:00
recovery.c nilfs2: delete unnecessary condition in load_segment_summary 2010-02-18 20:09:03 +09:00
sb.h nilfs2: simplify remaining sget() use 2009-06-11 21:36:18 -04:00
segbuf.c nilfs2: move iterator to write log into segment buffer 2010-02-13 12:26:03 +09:00
segbuf.h nilfs2: move iterator to write log into segment buffer 2010-02-13 12:26:03 +09:00
segment.c nilfs2: move iterator to write log into segment buffer 2010-02-13 12:26:03 +09:00
segment.h nilfs2: get rid of nilfs_segctor_req struct 2010-02-13 12:26:03 +09:00
sufile.c nilfs2: clean up get/put function of a segment usage 2009-11-20 10:05:51 +09:00
sufile.h nilfs2: clean up get/put function of a segment usage 2009-11-20 10:05:51 +09:00
super.c nilfs2: get rid of s_dirt flag use 2010-02-13 12:26:03 +09:00
the_nilfs.c nilfs2: issue discard request after cleaning segments 2010-02-13 12:26:02 +09:00
the_nilfs.h nilfs2: get rid of s_dirt flag use 2010-02-13 12:26:03 +09:00