diff options
| author | Greg Kroah-Hartman | 2014-02-24 22:34:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-24 22:34:54 +0100 |
| commit | 58e868be77bda526cc8d4264488ed393bc607720 (patch) | |
| tree | f95692355ca78239815c1df58fe2fee7dc79d80d /fs/ceph/file.c | |
| parent | Merge tag 'iio-fixes-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.tar.gz kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.tar.xz kernel-qcow2-linux-58e868be77bda526cc8d4264488ed393bc607720.zip | |
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index dfd2ce3419f8..09c7afe32e49 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -286,6 +286,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, } else { dout("atomic_open finish_open on dn %p\n", dn); if (req->r_op == CEPH_MDS_OP_CREATE && req->r_reply_info.has_create_ino) { + ceph_init_acl(dentry, dentry->d_inode, dir); *opened |= FILE_CREATED; } err = finish_open(file, dentry, ceph_open, opened); |