android_kernel_xiaomi_sm8350/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
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_debug.c
jfs_debug.h
jfs_dinode.h
jfs_dmap.c Merge branch 'master' into for-next 2010-04-23 02:08:44 +02:00
jfs_dmap.h
jfs_dtree.c
jfs_dtree.h
jfs_extent.c
jfs_extent.h
jfs_filsys.h
jfs_imap.c list.h: new helper - hlist_add_fake() 2010-10-25 21:24:15 -04:00
jfs_imap.h
jfs_incore.h
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_logmgr.c block: clean up blkdev_get() wrappers and their users 2010-11-13 11:55:18 +01:00
jfs_logmgr.h
jfs_metapage.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
jfs_metapage.h
jfs_mount.c fix printk typo 'faild' 2010-08-09 11:25:17 +02:00
jfs_superblock.h
jfs_txnmgr.c new helper: ihold() 2010-10-25 21:26:11 -04:00
jfs_txnmgr.h
jfs_types.h
jfs_umount.c
jfs_unicode.c
jfs_unicode.h
jfs_uniupr.c
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
jfs_xtree.h
Kconfig
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
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