From 61f7084020a58b5d4dbd2ce3186d59742c239a2a Mon Sep 17 00:00:00 2001 From: jpandre Date: Fri, 18 Sep 2009 19:51:10 +0000 Subject: [PATCH] Fixed avoidance of a double opening of an inode in create() --- libntfs-3g/inode.c | 7 ++----- src/ntfs-3g.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libntfs-3g/inode.c b/libntfs-3g/inode.c index cd8e52cf..fc24bb05 100644 --- a/libntfs-3g/inode.c +++ b/libntfs-3g/inode.c @@ -668,11 +668,8 @@ static int ntfs_inode_sync_file_name(ntfs_inode *ni) } ntfs_index_entry_mark_dirty(ictx); ntfs_index_ctx_put(ictx); - if (ni != index_ni) { - ntfs_inode_update_times(index_ni, NTFS_UPDATE_CTIME); - if (ntfs_inode_close(index_ni) && !err) - err = errno; - } + if ((ni != index_ni) && ntfs_inode_close(index_ni) && !err) + err = errno; } /* Check for real error occurred. */ if (errno != ENOENT) { diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c index d23eb36d..b6e6f970 100644 --- a/src/ntfs-3g.c +++ b/src/ntfs-3g.c @@ -1466,8 +1466,8 @@ static int ntfs_fuse_create(const char *org_path, mode_t typemode, dev_t dev, NInoSetDirty(ni); /* * closing ni will necessitate to open dir_ni to - * synchronize the index, which will update the change - * time again. Better avoid a dangerous double opening. + * synchronize the index. + * Better avoid a dangerous double opening. */ ntfs_fuse_update_times(dir_ni, NTFS_UPDATE_MCTIME); if (ntfs_inode_close(dir_ni))