|
@@ -2948,8 +2948,14 @@ static int do_tmpfile(int dfd, struct filename *pathname,
|
|
|
if (error)
|
|
|
goto out2;
|
|
|
error = open_check_o_direct(file);
|
|
|
- if (error)
|
|
|
+ if (error) {
|
|
|
fput(file);
|
|
|
+ } else if (!(op->open_flag & O_EXCL)) {
|
|
|
+ struct inode *inode = file_inode(file);
|
|
|
+ spin_lock(&inode->i_lock);
|
|
|
+ inode->i_state |= I_LINKABLE;
|
|
|
+ spin_unlock(&inode->i_lock);
|
|
|
+ }
|
|
|
out2:
|
|
|
mnt_drop_write(nd->path.mnt);
|
|
|
out:
|
|
@@ -3628,12 +3634,18 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
|
|
|
|
|
|
mutex_lock(&inode->i_mutex);
|
|
|
/* Make sure we don't allow creating hardlink to an unlinked file */
|
|
|
- if (inode->i_nlink == 0)
|
|
|
+ if (inode->i_nlink == 0 && !(inode->i_state & I_LINKABLE))
|
|
|
error = -ENOENT;
|
|
|
else if (max_links && inode->i_nlink >= max_links)
|
|
|
error = -EMLINK;
|
|
|
else
|
|
|
error = dir->i_op->link(old_dentry, dir, new_dentry);
|
|
|
+
|
|
|
+ if (!error && (inode->i_state & I_LINKABLE)) {
|
|
|
+ spin_lock(&inode->i_lock);
|
|
|
+ inode->i_state &= ~I_LINKABLE;
|
|
|
+ spin_unlock(&inode->i_lock);
|
|
|
+ }
|
|
|
mutex_unlock(&inode->i_mutex);
|
|
|
if (!error)
|
|
|
fsnotify_link(dir, inode, new_dentry);
|