summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-01-131-3/+10
|\
| * Merge branch 'tracepoint-updates-4.10' of git://git.kernel.org/pub/scm/linux/...Chris Mason2017-01-111-1/+1
| |\
| | * Btrfs: add 'inode' for extent map tracepointLiu Bo2017-01-091-1/+1
| * | Btrfs: adjust outstanding_extents counter properly when dio write is splitLiu Bo2017-01-031-2/+9
| |/
* | Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/...Linus Torvalds2016-12-171-1/+0
|\ \
| * | vfs: remove ".readlink = generic_readlink" assignmentsMiklos Szeredi2016-12-091-1/+0
* | | Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2016-12-161-461/+449
|\ \ \ | | |/ | |/|
| * | Revert "Btrfs: adjust len of writes if following a preallocated extent"Chris Mason2016-12-111-5/+3
| * | btrfs: remove root parameter from transaction commit/end routinesJeff Mahoney2016-12-061-37/+37
| * | btrfs: take an fs_info directly when the root is not used otherwiseJeff Mahoney2016-12-061-91/+95
| * | btrfs: root->fs_info cleanup, add fs_info convenience variablesJeff Mahoney2016-12-061-227/+267
| * | btrfs: root->fs_info cleanup, btrfs_calc_{trans,trunc}_metadata_sizeJeff Mahoney2016-12-061-2/+2
| * | btrfs: pull node/sector/stripe sizes out of root and into fs_infoJeff Mahoney2016-12-061-33/+40
| * | btrfs: call functions that always use the same root with fs_info insteadJeff Mahoney2016-12-061-3/+3
| * | btrfs: don't access the bio directly in the direct I/O codeChristoph Hellwig2016-11-301-4/+3
| * | btrfs: increment ctx->pos for every emitted or skipped dirent in readdirJeff Mahoney2016-11-301-20/+2
| * | btrfs: remove old tree_root dirent processing in btrfs_real_readdir()Jeff Mahoney2016-11-301-80/+37
| * | btrfs: change btrfs_csum_final result param type to u8Domagoj Tršan2016-11-301-1/+1
| * | Btrfs: adjust len of writes if following a preallocated extentLiu Bo2016-11-301-3/+5
| * | btrfs: remove constant parameter to memset_extent_buffer and rename itDavid Sterba2016-11-301-1/+1
| * | btrfs: remove unused headers, statfs.hDavid Sterba2016-11-301-1/+0
| * | Btrfs: deal with existing encompassing extent map in btrfs_get_extent()Omar Sandoval2016-11-301-3/+3
| * | btrfs: don't abuse REQ_OP_* flags for btrfs_map_blockChristoph Hellwig2016-11-291-3/+3
| |/
* | Merge branch 'for-4.10/block' of git://git.kernel.dk/linux-blockLinus Torvalds2016-12-131-7/+4
|\ \ | |/ |/|
| * block,fs: use REQ_* flags directlyChristoph Hellwig2016-11-011-4/+2
| * block: better op and flags encodingChristoph Hellwig2016-10-281-3/+2
* | Merge branch 'for-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/k...Linus Torvalds2016-11-041-4/+9
|\ \ | |/ |/|
| * btrfs: pass correct args to btrfs_async_run_delayed_refs()Wang Xiaoguang2016-10-241-2/+2
| * btrfs: qgroup: Prevent qgroup->reserved from going subzeroGoldwyn Rodrigues2016-10-241-2/+7
* | Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2016-10-111-27/+43
|\|
| * btrfs: convert pr_* to btrfs_* where possibleJeff Mahoney2016-09-261-7/+9
| * btrfs: unsplit printed stringsJeff Mahoney2016-09-261-4/+6
| * Btrfs: add a flags field to btrfs_fs_infoJosef Bacik2016-09-261-2/+2
| * btrfs: extend btrfs_set_extent_delalloc and its friends to support in-band de...Qu Wenruo2016-09-261-14/+26
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-10-101-12/+12
|\ \
| * \ Merge remote-tracking branch 'ovl/rename2' into for-linusAl Viro2016-10-101-1/+1
| |\ \
| | * | fs: rename "rename2" i_op to "rename"Miklos Szeredi2016-09-271-1/+1
| | |/
| * / fs: Replace current_fs_time() with current_time()Deepa Dinamani2016-09-271-11/+11
| |/
* | Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2016-10-101-12/+0
|\ \
| * | vfs: Remove {get,set,remove}xattr inode operationsAndreas Gruenbacher2016-10-071-12/+0
| |/
* | Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2016-10-101-1/+1
|\ \
| * | [btrfs] fix check_direct_IO() for non-iovec iteratorsAl Viro2016-10-101-1/+1
| |/
* | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-10-101-16/+1
|\ \
| * \ Merge remote-tracking branch 'jk/vfs' into work.miscAl Viro2016-10-081-1/+1
| |\ \
| | * | fs: Give dentry to inode_change_ok() instead of inodeJan Kara2016-09-221-1/+1
| * | | btrfs: use filemap_check_errors()Miklos Szeredi2016-09-161-15/+0
| | |/ | |/|
* / | block, dm-crypt, btrfs: Introduce bio_flags()Bart Van Assche2016-09-141-2/+3
|/ /
* | Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2016-08-261-10/+27
|\ \
| * | btrfs: update btrfs_space_info's bytes_may_use timelyWang Xiaoguang2016-08-251-10/+27
* | | Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2016-08-101-10/+36
|\| | | |/ |/|