diff --git a/[refs] b/[refs] index 6cbe158204a0..952ccae26b77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0612d9fb270a474fe6a46cc5b8d3f5b71cf5f580 +refs/heads/master: 4e9ed2f85af7adfa7c3f0efa839a53186254fdcb diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 18894fdf048a..9e2a534383d9 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -2654,6 +2654,7 @@ asmlinkage long sys_renameat(int olddfd, const char __user *oldname, oldnd.flags &= ~LOOKUP_PARENT; newnd.flags &= ~LOOKUP_PARENT; + newnd.flags |= LOOKUP_RENAME_TARGET; trap = lock_rename(new_dir, old_dir); diff --git a/trunk/include/linux/namei.h b/trunk/include/linux/namei.h index 6b5627afd2eb..99eb80306dc5 100644 --- a/trunk/include/linux/namei.h +++ b/trunk/include/linux/namei.h @@ -54,6 +54,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; #define LOOKUP_OPEN 0x0100 #define LOOKUP_CREATE 0x0200 #define LOOKUP_EXCL 0x0400 +#define LOOKUP_RENAME_TARGET 0x0800 extern int user_path_at(int, const char __user *, unsigned, struct path *);