lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Browse Source 
Pull tmpfile fix from Al Viro:
 "A fix for double iput() in ->tmpfile() on ext3 and ext4; I'd fucked it
  up, Miklos has caught it"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext[34]: fix double put in tmpfile
This commit is contained in:
Linus Torvalds
2013-10-16 17:18:18 -07:00
parent 8359ffa565 43ae9e3fc7
commit 0056019da4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ext3/namei.c
View File

@@ -1783,7 +1783,7 @@ retry:
d_tmpfile(dentry, inode); d_tmpfile(dentry, inode);
err = ext3_orphan_add(handle, inode); err = ext3_orphan_add(handle, inode);
if (err) if (err)
goto err_drop_inode; goto err_unlock_inode;
mark_inode_dirty(inode); mark_inode_dirty(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
} }
@@ -1791,10 +1791,9 @@ retry:
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry; goto retry;
return err; return err;
err_drop_inode: err_unlock_inode:
ext3_journal_stop(handle); ext3_journal_stop(handle);
unlock_new_inode(inode); unlock_new_inode(inode);
iput(inode);
return err; return err;
} }

5
fs/ext4/namei.c
View File

@@ -2319,7 +2319,7 @@ retry:
d_tmpfile(dentry, inode); d_tmpfile(dentry, inode);
err = ext4_orphan_add(handle, inode); err = ext4_orphan_add(handle, inode);
if (err) if (err)
goto err_drop_inode; goto err_unlock_inode;
mark_inode_dirty(inode); mark_inode_dirty(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
} }
@@ -2328,10 +2328,9 @@ retry:
if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
goto retry; goto retry;
return err; return err;
err_drop_inode: err_unlock_inode:
ext4_journal_stop(handle); ext4_journal_stop(handle);
unlock_new_inode(inode); unlock_new_inode(inode);
iput(inode);
return err; return err;
} }