diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 14:43:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 14:43:12 -0800 |
| commit | 2afe738fc070bf681227c0c9d95b9cd0c4782b0f (patch) | |
| tree | 7828986318aef18865e70e9d160855f47ccb1b54 /fs/autofs4 | |
| parent | d4173023e63cb85ec02eda02d1789bf078719f00 (diff) | |
| parent | 8b2770a4e1c7a837e1889d4f00026e999da5faa0 (diff) | |
| download | op-kernel-dev-2afe738fc070bf681227c0c9d95b9cd0c4782b0f.zip op-kernel-dev-2afe738fc070bf681227c0c9d95b9cd0c4782b0f.tar.gz | |
Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull userns updates from Eric Biederman:
"Between the holidays and other distractions only a small amount of
namespace work made it into my tree this time.
Just a final cleanup from a revert several kernels ago and a small
typo fix from Wolffhardt Schwabe"
* 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
fix typo in assignment of fs default overflow gid
autofs4: Modify autofs_wait to use current_uid() and current_gid()
userns: Don't fail follow_automount based on s_user_ns
Diffstat (limited to 'fs/autofs4')
| -rw-r--r-- | fs/autofs4/waitq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index 961a12d..a0c57c3 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -442,8 +442,8 @@ int autofs4_wait(struct autofs_sb_info *sbi, memcpy(&wq->name, &qstr, sizeof(struct qstr)); wq->dev = autofs4_get_dev(sbi); wq->ino = autofs4_get_ino(sbi); - wq->uid = current_cred()->uid; - wq->gid = current_cred()->gid; + wq->uid = current_uid(); + wq->gid = current_gid(); wq->pid = pid; wq->tgid = tgid; wq->status = -EINTR; /* Status return if interrupted */ |
