mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -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
|
|
@ -286,10 +286,14 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
|
|||
* XXX: how do you handle must_be dir?
|
||||
*/
|
||||
static int hfs_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)
|
||||
{
|
||||
int res;
|
||||
|
||||
if (flags & ~RENAME_NOREPLACE)
|
||||
return -EINVAL;
|
||||
|
||||
/* Unlink destination if it already exists */
|
||||
if (d_really_is_positive(new_dentry)) {
|
||||
res = hfs_remove(new_dir, new_dentry);
|
||||
|
|
|
|||
Loading…
Reference in a new issue