mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge remote-tracking branch 'ovl/rename2' into for-linus
This commit is contained in:
commit
3873691e5a
483 changed files with 4379 additions and 2736 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue