diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 10:29:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 10:29:21 -0800 |
| commit | 1a52bb0b686844021597d190e562ab55d1210104 (patch) | |
| tree | 7edf13509869a6a7f1f488a679f15ff6c3057c54 /fs/char_dev.c | |
| parent | 8638094e956a47dbb9a25166705a91e9a0981d52 (diff) | |
| parent | 83eb26af0db71f2dfe551405c55d982288fa6178 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: ensure prealloc_blob is in place when removing xattr
rbd: initialize snap_rwsem in rbd_add()
ceph: enable/disable dentry complete flags via mount option
vfs: export symbol d_find_any_alias()
ceph: always initialize the dentry in open_root_dentry()
libceph: remove useless return value for osd_client __send_request()
ceph: avoid iput() while holding spinlock in ceph_dir_fsync
ceph: avoid useless dget/dput in encode_fh
ceph: dereference pointer after checking for NULL
crush: fix force for non-root TAKE
ceph: remove unnecessary d_fsdata conditional checks
ceph: Use kmemdup rather than duplicating its implementation
Fix up conflicts in fs/ceph/super.c (d_alloc_root() failure handling vs
always initialize the dentry in open_root_dentry)
Diffstat (limited to 'fs/char_dev.c')
0 files changed, 0 insertions, 0 deletions