@@ -807,6 +807,25 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
return finish_no_open(file, res);
}
+static struct dentry *fuse_atomic_open_alloc_dentry(struct dentry *entry,
+ wait_queue_head_t *wq)
+{
+ struct dentry *new;
+
+ d_drop(entry);
+ new = d_alloc_parallel(entry->d_parent, &entry->d_name,
+ wq);
+ if (IS_ERR(new))
+ return new;
+
+ /* XXX Can this happen at all and there a way to handle it? */
+ if (unlikely(!d_in_lookup(new))) {
+ dput(new);
+ new = ERR_PTR(-EIO);
+ }
+ return new;
+}
+
/**
* Revalidate inode hooked into dentry against freshly acquired
* attributes. If inode is stale then allocate new dentry and
@@ -835,17 +854,9 @@ fuse_atomic_open_revalidate(struct fuse_conn *fc, struct dentry *entry,
struct dentry *new = NULL;
if (!switched && !d_in_lookup(entry)) {
- d_drop(entry);
- new = d_alloc_parallel(entry->d_parent, &entry->d_name,
- wq);
+ new = fuse_atomic_open_alloc_dentry(entry, wq);
if (IS_ERR(new))
return new;
-
- if (unlikely(!d_in_lookup(new))) {
- dput(new);
- new = ERR_PTR(-EIO);
- return new;
- }
}
fuse_invalidate_entry(entry);
@@ -999,26 +1010,13 @@ static int _fuse_atomic_open(struct inode *dir, struct dentry *entry,
/* prevent racing/parallel lookup */
if (!(flags & O_CREAT) && !d_in_lookup(entry)) {
- d_drop(entry);
- switched_entry = d_alloc_parallel(entry->d_parent,
- &entry->d_name, &wq);
+ switched_entry = fuse_atomic_open_alloc_dentry(entry, &wq);
if (IS_ERR(switched_entry)) {
- err = PTR_ERR(switched_entry);
- goto out_free_ff;
- }
-
- if (unlikely(!d_in_lookup(switched_entry))) {
- /* fall back */
- dput(switched_entry);
- switched_entry = NULL;
-
if (!inode) {
goto free_and_fallback;
} else {
- /* XXX can this happen at all and is there a
- * better way to handle it?
- */
- err = -EIO;
+ /* XXX Is there a better way to handle it? */
+ err = PTR_ERR(switched_entry);
goto out_free_ff;
}
}
The same code was used in fuse_atomic_open_revalidate() _fuse_atomic_open(). (If preferred, this could be merged into the main fuse atomic revalidate patch). Or adding the function could be moved up in the series. Signed-off-by: Bernd Schubert <bschubert@ddn.com> Cc: Miklos Szeredi <miklos@szeredi.hu> Cc: Dharmendra Singh <dsingh@ddn.com> Cc: Horst Birthelmer <hbirthelmer@ddn.com> Cc: linux-fsdevel@vger.kernel.org --- fs/fuse/dir.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-)