summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew)Linus Torvalds2016-01-1572-262/+252
|\
| * mm: rework virtual memory accountingKonstantin Khlebnikov2016-01-141-4/+3
| * hugetlb: make mm and fs code explicitly non-modularPaul Gortmaker2016-01-141-25/+2
| * mm: /proc/pid/clear_refs: no need to clear VM_SOFTDIRTY in clear_soft_dirty_p...Oleg Nesterov2016-01-141-3/+0
| * proc: meminfo: estimate available memory more conservativelyJohannes Weiner2016-01-141-4/+1
| * fs/block_dev.c:bdev_write_page(): use blk_queue_enter(..., GFP_NOIO)Andrew Morton2016-01-141-1/+1
| * mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/statusJerome Marchand2016-01-141-2/+12
| * mm, shmem: add internal shmem resident memory accountingJerome Marchand2016-01-141-1/+2
| * mm, proc: reduce cost of /proc/pid/smaps for unpopulated shmem mappingsVlastimil Babka2016-01-141-29/+13
| * mm, proc: reduce cost of /proc/pid/smaps for shmem mappingsVlastimil Babka2016-01-141-2/+20
| * mm, proc: account for shmem swap in /proc/pid/smapsVlastimil Babka2016-01-141-0/+51
| * mm/mempolicy.c: convert the shared_policy lock to a rwlockNathan Zimmer2016-01-141-1/+1
| * kmemcg: account certain kmem allocations to memcgVladimir Davydov2016-01-1452-68/+82
| * Revert "kernfs: do not account ino_ida allocations to memcg"Vladimir Davydov2016-01-141-8/+1
| * ocfs2/dlm: cleanup redunant lksb flags in dlmcommon.hJoseph Qi2016-01-141-11/+0
| * ocfs2: dlm: remove redundant codeJunxiao Bi2016-01-141-5/+1
| * ocfs2: access orphan dinode before delete entry in ocfs2_orphan_delJoseph Qi2016-01-141-9/+9
| * ocfs2/dlm: do not insert a new mle when another process is already migratingxuejiufei2016-01-141-2/+3
| * ocfs2/dlm: ignore cleaning the migration mle that is inusexuejiufei2016-01-141-11/+15
| * ocfs2: do not lock/unlock() inode DLM lockGoldwyn Rodrigues2016-01-141-8/+0
| * ocfs2: fix slot overwritten if storage link down during mountjiangyiwen2016-01-141-1/+10
| * ocfs2/dlm: return appropriate value when dlm_grab() returns NULLXue jiufei2016-01-142-2/+2
| * ocfs2: clean up redundant NULL check before iputJoseph Qi2016-01-147-25/+11
| * ocfs2/dlm: wait until DLM_LOCK_RES_SETREF_INPROG is cleared in dlm_deref_lock...jiangyiwen2016-01-141-1/+1
| * ocfs2: constify ocfs2_extent_tree_operations structuresJulia Lawall2016-01-142-7/+7
| * ocfs2/dlm: fix a race between purge and migrationXue jiufei2016-01-141-1/+8
| * ocfs2: o2hb: increase unsteady iterationsJunxiao Bi2016-01-141-2/+2
| * ocfs2: return non-zero st_blocks for inline dataJohn Haxby2016-01-141-0/+8
| * ocfs2: optimize bad declarations and redundant assignmentNorton.Zhu2016-01-141-6/+2
| * logfs: fix logfs build errors and dependenciesArnd Bergmann2016-01-141-1/+1
| * fsnotify: destroy marks with call_srcu instead of dedicated threadJeff Layton2016-01-141-52/+14
| * fs/notify/inode_mark.c: use list_next_entry in fsnotify_unmount_inodesGeliang Tang2016-01-141-2/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2016-01-142-3/+3
|\ \
| * | Documentation: filesystem: Fix typo in fs/eventfd.cMasanari Iida2015-12-081-2/+2
| * | fs/super.c: use && instead of & for warn_on conditionVincent Stehlé2015-12-081-1/+1
* | | Merge tag 'nfs-for-4.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2016-01-1422-417/+1148
|\ \ \
| * | | NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios()Trond Myklebust2016-01-081-3/+0
| * | | NFSv4: Fix a compile warning about no prototype for nfs4_ioctl()Trond Myklebust2016-01-081-1/+1
| * | | Merge branch 'bugfixes'Trond Myklebust2016-01-077-25/+92
| |\ \ \
| | * | | pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh()Trond Myklebust2015-12-301-1/+1
| | * | | NFS: Fix attribute cache revalidationTrond Myklebust2015-12-301-15/+39
| | * | | NFS: Ensure we revalidate attributes before using execute_ok()Trond Myklebust2015-12-281-2/+16
| | * | | NFS: Flush reclaim writes using FLUSH_COND_STABLETrond Myklebust2015-12-281-1/+1
| | * | | NFS: Background flush should not be low priorityTrond Myklebust2015-12-281-2/+0
| | * | | NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturnTrond Myklebust2015-12-281-1/+0
| | * | | NFSv4: Don't perform cached access checks before we've OPENed the fileTrond Myklebust2015-12-281-0/+3
| | * | | NFS: Allow the combination pNFS and labeled NFSTrond Myklebust2015-12-281-0/+3
| | * | | NFS42: handle layoutstats stateid errorPeng Tao2015-12-281-2/+27
| | * | | nfs: Fix race in __update_open_stateid()Andrew Elble2015-12-281-1/+1
| | * | | nfs: fix missing assignment in nfs4_sequence_done tracepointAndrew Elble2015-12-281-0/+1
OpenPOWER on IntegriCloud