xiaomi-sm8450/android_kernel_xiaomi_sm8450
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

6
fs/bfs/dir.c
View File

@@ -207,7 +207,8 @@ out_brelse:
}
static int bfs_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, *new_inode;
struct buffer_head *old_bh, *new_bh;
@@ -215,6 +216,9 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry,
struct bfs_sb_info *info;
int error = -ENOENT;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
old_bh = new_bh = NULL;
old_inode = d_inode(old_dentry);
if (S_ISDIR(old_inode->i_mode))