Merge branches 'work.namei', 'work.dcache' and 'work.iov_iter' into for-linus

[linux.git] / fs / ceph / file.c

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index f995e3528a33107bfa1caab3b09b2b5f5af8cf32..159fc8f1a6a00dbc5b291ed6e17d583dd90a269e 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -351,10 +351,6 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
        if (dentry->d_name.len > NAME_MAX)
                return -ENAMETOOLONG;
 
-       err = ceph_init_dentry(dentry);
-       if (err < 0)
-               return err;
-
        if (flags & O_CREAT) {
                err = ceph_pre_init_acls(dir, &mode, &acls);
                if (err < 0)