summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-10-1126-488/+354
|\
| * locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKINGJeff Layton2014-10-071-2/+2
| * locks: flock_make_lock should return a struct file_lock (or PTR_ERR)Jeff Layton2014-10-071-8/+11
| * locks: set fl_owner for leases to filp instead of current->filesJeff Layton2014-10-072-8/+2
| * locks: give lm_break a return valueJeff Layton2014-10-073-13/+23
| * locks: __break_lease cleanup in preparation of allowing direct removal of leasesJeff Layton2014-10-071-24/+25
| * locks: remove i_have_this_lease check from __break_leaseJeff Layton2014-10-071-4/+2
| * locks: move freeing of leases outside of i_lockJeff Layton2014-10-074-20/+30
| * locks: move i_lock acquisition into generic_*_lease handlersJeff Layton2014-10-073-16/+16
| * locks: define a lm_setup handler for leasesJeff Layton2014-10-073-48/+51
| * locks: plumb a "priv" pointer into the setlease routinesJeff Layton2014-10-077-26/+37
| * nfsd: don't keep a pointer to the lease in nfs4_fileJeff Layton2014-10-072-10/+4
| * locks: clean up vfs_setlease kerneldoc commentsJeff Layton2014-10-071-24/+10
| * locks: generic_delete_lease doesn't need a file_lock at allJeff Layton2014-10-073-28/+22
| * nfsd: fix potential lease memory leak in nfs4_setleaseJeff Layton2014-10-071-2/+5
| * locks: close potential race in lease_get_mtimeJeff Layton2014-10-071-2/+12
| * security: make security_file_set_fowner, f_setown and __f_setown void returnJeff Layton2014-09-0912-42/+26
| * locks: consolidate "nolease" routinesJeff Layton2014-09-096-35/+20
| * locks: remove lock_may_read and lock_may_writeJeff Layton2014-09-092-94/+0
| * lockd: rip out deferred lock handling from testlock codepathJeff Layton2014-09-092-50/+6
| * NFSD: Get reference of lockowner when coping file_lockKinglong Mee2014-09-091-4/+21
| * NFSD: New helper nfs4_get_stateowner() for atomic_inc sop referenceKinglong Mee2014-09-091-16/+16
| * locks: Copy fl_lmops information for conflock in locks_copy_conflock()Kinglong Mee2014-09-092-20/+17
| * locks: New ops in lock_manager_operations for get/put ownerKinglong Mee2014-09-092-2/+12
| * locks: Rename __locks_copy_lock() to locks_copy_conflock()Kinglong Mee2014-09-092-7/+7
| * locks: Remove unused conf argument from lm_grantJoe Perches2014-09-093-14/+8
| * locks: pass correct "before" pointer to locks_unlink_lock in generic_add_leaseJeff Layton2014-09-091-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2014-10-1149-1534/+3617
|\ \
| * | btrfs: Fix compile error when CONFIG_SECURITY is not set.Qu Wenruo2014-10-081-0/+2
| * | Btrfs: fix compiles when CONFIG_BTRFS_FS_RUN_SANITY_TESTS is offChris Mason2014-10-072-3/+2
| * | btrfs: Make btrfs handle security mount options internally to avoid losing se...Qu Wenruo2014-10-062-5/+97
| * | Merge branch 'remove-unlikely' of git://git.kernel.org/pub/scm/linux/kernel/g...Chris Mason2014-10-046-16/+16
| |\ \
| | * | btrfs: remove unlikely from data-dependent branches and slow pathsDavid Sterba2014-10-025-10/+10
| | * | btrfs: remove unlikely from NULL checksDavid Sterba2014-10-022-6/+6
| * | | Merge branch 'cleanup/blocksize-diet-part1' of git://git.kernel.org/pub/scm/l...Chris Mason2014-10-049-105/+57
| |\ \ \
| | * | | btrfs: remove blocksize from btrfs_alloc_free_block and renameDavid Sterba2014-10-025-27/+21
| | * | | btrfs: remove unused parameter blocksize from btrfs_find_tree_blockDavid Sterba2014-10-024-12/+9
| | * | | btrfs: remove parameter blocksize from read_tree_blockDavid Sterba2014-10-027-37/+18
| | * | | btrfs: inline code of reada_tree_block and remove itDavid Sterba2014-10-021-10/+2
| | * | | btrfs: return void from readahead_tree_blockDavid Sterba2014-10-023-8/+4
| | * | | btrfs: remove unused parameter from readahead_tree_blockDavid Sterba2014-10-025-16/+8
| | |/ /
| * | | Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/ke...Chris Mason2014-10-0417-135/+130
| |\ \ \
| | * | | btrfs: move checks for DUMMY_ROOT into a helperDavid Sterba2014-10-025-21/+23
| | * | | btrfs: new define for the inline extent data startDavid Sterba2014-10-022-10/+9
| | * | | btrfs: kill extent_buffer_page helperDavid Sterba2014-10-022-35/+26
| | * | | btrfs: drop constant param from btrfs_release_extent_buffer_pageDavid Sterba2014-10-021-9/+6
| | * | | btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUBDavid Sterba2014-10-024-5/+4
| | * | | btrfs: let merge_reloc_roots return voidDavid Sterba2014-10-021-2/+1
| | * | | btrfs: remove unused members from struct scrub_warningDavid Sterba2014-10-021-15/+2
| | * | | btrfs: use slab for end_io_wq structuresDavid Sterba2014-10-023-10/+38
OpenPOWER on IntegriCloud