diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-16 15:29:36 -0700 |
| commit | b0477f5f8ec85bf8a82f6aa6eee308d72c418032 (patch) | |
| tree | d520be10a261f418dbf4539f1d2b5d48d74ba0d3 /fs/open.c | |
| parent | 13a29d9ad242f0bf3b31afe812c81558d54892de (diff) | |
| parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.07-android
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index de92c13b58be..4a8a355ffab8 100644 --- a/fs/open.c +++ b/fs/open.c @@ -558,6 +558,7 @@ static int chown_common(struct path *path, uid_t user, gid_t group) uid = make_kuid(current_user_ns(), user); gid = make_kgid(current_user_ns(), group); +retry_deleg: newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { if (!uid_valid(uid)) @@ -574,7 +575,6 @@ static int chown_common(struct path *path, uid_t user, gid_t group) if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; -retry_deleg: mutex_lock(&inode->i_mutex); error = security_path_chown(path, uid, gid); if (!error) |