Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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
+4
-6
+2
-3
fs/ext3/namei.c
+2
-3
fs/ext3/namei.c
···
1783
1783
d_tmpfile(dentry, inode);
1784
1784
err = ext3_orphan_add(handle, inode);
1785
1785
if (err)
1786
-
goto err_drop_inode;
1786
+
goto err_unlock_inode;
1787
1787
mark_inode_dirty(inode);
1788
1788
unlock_new_inode(inode);
1789
1789
}
···
1791
1791
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
1792
1792
goto retry;
1793
1793
return err;
1794
-
err_drop_inode:
1794
+
err_unlock_inode:
1795
1795
ext3_journal_stop(handle);
1796
1796
unlock_new_inode(inode);
1797
-
iput(inode);
1798
1797
return err;
1799
1798
}
1800
1799
+2
-3
fs/ext4/namei.c
+2
-3
fs/ext4/namei.c
···
2319
2319
d_tmpfile(dentry, inode);
2320
2320
err = ext4_orphan_add(handle, inode);
2321
2321
if (err)
2322
-
goto err_drop_inode;
2322
+
goto err_unlock_inode;
2323
2323
mark_inode_dirty(inode);
2324
2324
unlock_new_inode(inode);
2325
2325
}
···
2328
2328
if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
2329
2329
goto retry;
2330
2330
return err;
2331
-
err_drop_inode:
2331
+
err_unlock_inode:
2332
2332
ext4_journal_stop(handle);
2333
2333
unlock_new_inode(inode);
2334
-
iput(inode);
2335
2334
return err;
2336
2335
}
2337
2336