summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/...Linus Torvalds2016-12-1746-110/+120
|\
| * vfs: make generic_readlink() staticMiklos Szeredi2016-12-092-3/+2
| * vfs: remove ".readlink = generic_readlink" assignmentsMiklos Szeredi2016-12-0938-45/+0
| * vfs: default to generic_readlink()Miklos Szeredi2016-12-094-6/+23
| * vfs: replace calling i_op->readlink with vfs_readlink()Miklos Szeredi2016-12-096-13/+35
| * proc/self: use generic_readlinkMiklos Szeredi2016-12-092-27/+2
| * ecryptfs: use vfs_get_link()Miklos Szeredi2016-12-091-17/+12
| * bad_inode: add missing i_op initializersMiklos Szeredi2016-12-091-4/+51
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-12-1764-509/+1027
|\ \
| * \ Merge branch 'work.autofs' into for-linusAl Viro2016-12-1613-75/+131
| |\ \
| | * | autofs - dont hold spin lock over direct mount expireIan Kent2016-12-031-7/+10
| | * | autofs - constify misc struct path instancesIan Kent2016-12-032-2/+2
| | * | vfs: remove unused have_submounts() functionIan Kent2016-12-032-34/+0
| | * | autofs: use path_has_submounts() to fix unreliable have_submount() checksIan Kent2016-12-033-11/+15
| | * | autofs: use path_is_mountpoint() to fix unreliable d_mountpoint() checksIan Kent2016-12-031-7/+7
| | * | autofs: change autofs4_wait() to take struct pathIan Kent2016-12-034-12/+15
| | * | autofs: change autofs4_expire_wait()/do_expire_wait() to take struct pathIan Kent2016-12-034-8/+11
| | * | vfs: add path_has_submounts()Ian Kent2016-12-032-0/+40
| | * | vfs: add path_is_mountpoint() helperIan Kent2016-12-033-0/+37
| | * | vfs: change d_manage() to take a struct pathIan Kent2016-12-025-12/+12
| * | | Merge remote-tracking branch 'djwong/ocfs2-vfs-reflink-6' into for-linusAl Viro2016-12-16208-903/+2175
| |\ \ \
| | * | | ocfs2: implement the VFS clone_range, copy_range, and dedupe_range featuresDarrick J. Wong2016-12-104-3/+474
| | * | | ocfs2: charge quota for reflinked blocksDarrick J. Wong2016-12-101-0/+7
| | * | | ocfs2: fix bad pointer castDarrick J. Wong2016-12-101-1/+1
| | * | | ocfs2: always unlock when completing dio writesDarrick J. Wong2016-12-101-4/+1
| | * | | ocfs2: don't eat io errors during _dio_end_io_writeDarrick J. Wong2016-12-101-6/+9
| | * | | ocfs2: budget for extent tree splits when adding refcount flagDarrick J. Wong2016-12-101-0/+3
| | * | | ocfs2: prohibit refcounted swapfilesDarrick J. Wong2016-12-101-0/+9
| | * | | ocfs2: add newlines to some error messagesDarrick J. Wong2016-12-101-2/+2
| | * | | ocfs2: convert inode refcount test to a helperDarrick J. Wong2016-12-106-29/+23
| | * | | vfs: refactor clone/dedupe_file_range common functionsDarrick J. Wong2016-12-093-204/+219
| | * | | fs: try to clone files first in vfs_copy_file_rangeChristoph Hellwig2016-12-095-40/+22
| | | |/ | | |/|
| * | | Merge branch 'work.write_end' into for-linusAl Viro2016-12-166-65/+52
| |\ \ \
| | * | | simple_write_end(): don't zero in short copy into uptodateAl Viro2016-12-101-6/+8
| | * | | exofs: don't mess with simple_write_{begin,end}Al Viro2016-12-101-38/+30
| | * | | 9p: saner ->write_end() on failing copy into non-uptodate pageAl Viro2016-12-101-11/+4
| | * | | fix gfs2_stuffed_write_end() on short copiesAl Viro2016-12-101-3/+1
| | * | | fix ceph_write_end()Al Viro2016-12-101-6/+8
| | * | | nfs_write_end(): fix handling of short copiesAl Viro2016-12-091-1/+1
| | | |/ | | |/|
| * | | vfs: misc struct path constificationAl Viro2016-12-054-5/+5
| * | | namespace.c: constify struct path passed to a bunch of primitivesAl Viro2016-12-054-8/+8
| * | | quota: constify struct path in quota_onAl Viro2016-12-056-9/+9
| * | | constify alloc_file()Al Viro2016-12-052-2/+2
| * | | constify btrfs_mksubvol()Al Viro2016-12-051-1/+1
| * | | autofs: constify find_autofs_mount() callbackAl Viro2016-12-051-3/+3
| * | | constify get_dcookie() and friendsAl Viro2016-12-054-6/+6
| * | | audit_log_{name,link_denied}: constify struct pathAl Viro2016-12-053-4/+4
| * | | fsnotify: constify the places working with ->f_pathAl Viro2016-12-051-5/+5
| * | | constify fsnotify_parent()Al Viro2016-12-053-4/+4
| * | | fsnotify(): constify 'data'Al Viro2016-12-052-5/+5