2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/fs/jfs
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
acl.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
endian24.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
file.c remove inode_setattr 2010-08-09 16:47:37 -04:00
inode.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ioctl.c userns: rename is_owner_or_cap to inode_owner_or_capable 2011-03-23 19:47:13 -07:00
jfs_acl.h fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
jfs_btree.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_debug.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
jfs_debug.h JFS: switch to seq_files 2008-05-13 08:22:10 -05:00
jfs_dinode.h BKL-removal: Implement a compat_ioctl handler for JFS 2008-02-07 13:45:29 -06:00
jfs_dmap.c Merge branch 'master' into for-next 2010-04-23 02:08:44 +02:00
jfs_dmap.h jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g 2010-02-02 14:21:35 -06:00
jfs_dtree.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
jfs_dtree.h jfs: remove DIRENTSIZ 2008-06-10 15:12:58 -05:00
jfs_extent.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
jfs_extent.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_filsys.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_imap.c list.h: new helper - hlist_add_fake() 2010-10-25 21:24:15 -04:00
jfs_imap.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_incore.h switch jfs to inode->i_acl 2009-06-24 08:17:04 -04:00
jfs_inode.c jfs: replace inode uid,gid,mode init with helper 2010-05-21 18:31:23 -04:00
jfs_inode.h switch jfs to ->evict_inode() 2010-08-09 16:48:17 -04:00
jfs_lock.h JFS: use __set_current_state() 2007-04-26 07:30:29 -05:00
jfs_logmgr.c block: clean up blkdev_get() wrappers and their users 2010-11-13 11:55:18 +01:00
jfs_logmgr.h more low-hanging fruits - kernel, fs, lib signedness 2007-10-14 12:41:52 -07:00
jfs_metapage.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
jfs_metapage.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_mount.c fix printk typo 'faild' 2010-08-09 11:25:17 +02:00
jfs_superblock.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_txnmgr.c new helper: ihold() 2010-10-25 21:26:11 -04:00
jfs_txnmgr.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_types.h jfs: remove xtLookupList() 2009-01-09 15:42:04 -06:00
jfs_umount.c JFS: Make sure special inode data is written after journal is flushed 2008-01-03 13:11:37 -06:00
jfs_unicode.c JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_unicode.h 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
jfs_uniupr.c JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_xattr.h fs/vfs/security: pass last path component to LSM on inode creation 2011-02-01 11:12:29 -05:00
jfs_xtree.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
jfs_xtree.h jfs: remove xtLookupList() 2009-01-09 15:42:04 -06:00
Kconfig jfs: needs crc32_le 2009-02-02 13:43:28 -06:00
Makefile fs: change to new flag variable 2011-03-17 14:02:57 +01:00
namei.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 2011-03-16 09:15:43 -07:00
resize.c jfs: fix diAllocExt error in resizing filesystem 2010-04-16 08:01:20 -05:00
super.c switch jfs to ->s_d_op, close exportfs races 2011-01-12 20:02:43 -05:00
symlink.c jfs: add jfs specific ->setattr call 2010-04-16 08:05:50 -05:00
xattr.c userns: rename is_owner_or_cap to inode_owner_or_capable 2011-03-23 19:47:13 -07:00