i/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ovl/rename2' into for-linus

Browse Source
This commit is contained in:
Al Viro
2016-10-10 23:02:51 -04:00
parent c2050a454c aadfa8019e
commit 3873691e5a
483 changed files with 4393 additions and 2750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/ext2/namei.c
+5 -1
View File
@@ -328,7 +328,8 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
}
static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
struct inode * new_dir, struct dentry * new_dentry )
struct inode * new_dir, struct dentry * new_dentry,
unsigned int flags)
{
struct inode * old_inode = d_inode(old_dentry);
struct inode * new_inode = d_inode(new_dentry);
@@ -338,6 +339,9 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
struct ext2_dir_entry_2 * old_de;
int err;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
err = dquot_initialize(old_dir);
if (err)
goto out;