summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2017-05-1010-52/+425
|\
| * ovl: update documentation w.r.t. constant inode numbersAmir Goldstein2017-05-051-1/+8
| * ovl: persistent inode numbers for upper hardlinksAmir Goldstein2017-05-051-0/+3
| * ovl: merge getattr for dir and nondirMiklos Szeredi2017-05-053-64/+30
| * ovl: constant st_ino/st_dev across copy upAmir Goldstein2017-05-051-1/+38
| * ovl: persistent inode number for directoriesAmir Goldstein2017-05-051-4/+33
| * ovl: set the ORIGIN type flagAmir Goldstein2017-05-052-4/+8
| * ovl: lookup non-dir copy-up-origin by file handleAmir Goldstein2017-05-051-0/+132
| * ovl: use an auxiliary var for overlay root entryAmir Goldstein2017-05-051-5/+4
| * ovl: store file handle of lower inode on copy upAmir Goldstein2017-05-052-0/+118
| * ovl: check if all layers are on the same fsAmir Goldstein2017-05-054-0/+18
| * ovl: do not set overlay.opaque on non-dir createAmir Goldstein2017-04-261-1/+1
| * ovl: check IS_APPEND() on real upper inodeAmir Goldstein2017-04-201-3/+25
| * vfs: ftruncate check IS_APPEND() on real upper inodeAmir Goldstein2017-04-201-1/+2
| * ovl: Use designated initializersKees Cook2017-04-202-3/+3
| * ovl: lockdep annotate of nested stacked overlayfs inode lockAmir Goldstein2017-03-081-0/+37
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz...Linus Torvalds2017-05-104-24/+50
|\ \
| * | fuse: Add support for pid namespacesSeth Forshee2017-04-184-9/+35
| * | fuse: convert fuse_conn.count from atomic_t to refcount_tElena Reshetova2017-04-182-4/+4
| * | fuse: convert fuse_req.count from atomic_t to refcount_tElena Reshetova2017-04-182-6/+5
| * | fuse: convert fuse_file.count from atomic_t to refcount_tElena Reshetova2017-04-182-5/+6
| |/
* | Merge tag 'ceph-for-4.12-rc1' of git://github.com/ceph/ceph-clientLinus Torvalds2017-05-1027-277/+706
|\ \
| * | ceph: fix memory leak in __ceph_setxattr()Luis Henriques2017-05-041-0/+3
| * | ceph: fix file open flags on ppc64Alexander Graf2017-05-042-1/+45
| * | ceph: choose readdir frag based on previous readdir replyYan, Zheng2017-05-041-7/+12
| * | rbd: exclusive map optionIlya Dryomov2017-05-041-10/+73
| * | rbd: return ResponseMessage result from rbd_handle_request_lock()Ilya Dryomov2017-05-041-14/+26
| * | rbd: kill rbd_is_lock_supported()Ilya Dryomov2017-05-041-11/+3
| * | rbd: support updating the lock cookie without releasing the lockIlya Dryomov2017-05-043-25/+97
| * | rbd: store lock cookieIlya Dryomov2017-05-041-5/+8
| * | rbd: ignore unlock errorsIlya Dryomov2017-05-041-18/+14
| * | rbd: fix error handling around rbd_init_disk()Ilya Dryomov2017-05-041-43/+44
| * | rbd: move rbd_unregister_watch() call into rbd_dev_image_release()Ilya Dryomov2017-05-041-15/+3
| * | rbd: move rbd_dev_destroy() call out of rbd_dev_image_release()Ilya Dryomov2017-05-041-5/+5
| * | ceph: when seeing write errors on an inode, switch to sync writesJeff Layton2017-05-043-14/+49
| * | Revert "ceph: SetPageError() for writeback pages if writepages fails"Jeff Layton2017-05-041-3/+0
| * | ceph: handle epoch barriers in cap messagesJeff Layton2017-05-043-7/+41
| * | libceph: add an epoch_barrier field to struct ceph_osd_clientJeff Layton2017-05-043-8/+76
| * | libceph: abort already submitted but abortable requests when map or pool goes...Jeff Layton2017-05-041-0/+34
| * | libceph: allow requests to return immediately on full conditions if caller wi...Jeff Layton2017-05-044-0/+10
| * | libceph: remove req->r_replay_versionJeff Layton2017-05-043-7/+5
| * | ceph: make seeky readdir more efficientYan, Zheng2017-05-045-6/+21
| * | ceph: close stopped mds' sessionYan, Zheng2017-05-041-0/+16
| * | ceph: fix potential use-after-freeYan, Zheng2017-05-041-2/+8
| * | ceph: allow connecting to mds whose rank >= mdsmap::m_max_mdsYan, Zheng2017-05-044-26/+56
| * | ceph: fix wrong check in ceph_renew_caps()Yan, Zheng2017-05-041-1/+1
| * | libceph: convert ceph_pagelist.refcnt from atomic_t to refcount_tElena Reshetova2017-05-043-5/+5
| * | libceph: convert ceph_osd.o_ref from atomic_t to refcount_tElena Reshetova2017-05-042-9/+10
| * | libceph: convert ceph_snap_context.nref from atomic_t to refcount_tElena Reshetova2017-05-042-4/+5
| * | ceph: convert ceph_cap_snap.nref from atomic_t to refcount_tElena Reshetova2017-05-043-5/+6