diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-02-11 12:55:05 +0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-02-17 12:37:11 -0800 |
| commit | b20a95a0dd47c56c5d20e1c9e260293d0b87abe0 (patch) | |
| tree | ac7220792872efb768b087334f09d28439628d87 | |
| parent | 7a92d64760541e66bf5d1131f029b82773ce3922 (diff) | |
| download | op-kernel-dev-b20a95a0dd47c56c5d20e1c9e260293d0b87abe0.zip op-kernel-dev-b20a95a0dd47c56c5d20e1c9e260293d0b87abe0.tar.gz | |
ceph: add missing init_acl() for mkdir() and atomic_open()
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
| -rw-r--r-- | fs/ceph/dir.c | 13 | ||||
| -rw-r--r-- | fs/ceph/file.c | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 6da4df8..2e3b30d 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -695,9 +695,8 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry, ceph_mdsc_put_request(req); if (!err) - err = ceph_init_acl(dentry, dentry->d_inode, dir); - - if (err) + ceph_init_acl(dentry, dentry->d_inode, dir); + else d_drop(dentry); return err; } @@ -735,7 +734,9 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry, if (!err && !req->r_reply_info.head->is_dentry) err = ceph_handle_notrace_create(dir, dentry); ceph_mdsc_put_request(req); - if (err) + if (!err) + ceph_init_acl(dentry, dentry->d_inode, dir); + else d_drop(dentry); return err; } @@ -776,7 +777,9 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) err = ceph_handle_notrace_create(dir, dentry); ceph_mdsc_put_request(req); out: - if (err < 0) + if (!err) + ceph_init_acl(dentry, dentry->d_inode, dir); + else d_drop(dentry); return err; } diff --git a/fs/ceph/file.c b/fs/ceph/file.c index dfd2ce3..09c7afe 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); |
