vbatts
/
containerd
1
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #506 from kevinetc123/patch-fmt 

use bitclear instead of seperating it and fix some typo
This commit is contained in:
Phil Estes 2017-02-09 13:39:11 -08:00 committed by GitHub
parent 42a17f9391 6425680d94
commit c9ba5dc9a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mount.go
View File

@ -86,7 +86,7 @@ func parseMountOptions(options []string) (int, string) {
// then it is a data value for a specific fs type // then it is a data value for a specific fs type
if f, exists := flags[o]; exists && f.flag != 0 { if f, exists := flags[o]; exists && f.flag != 0 {
if f.clear { if f.clear {
flag &= ^f.flag flag &^= f.flag
} else { } else {
flag |= f.flag flag |= f.flag
} }

2
sys/prctl.go
View File

@ -26,7 +26,7 @@ const prSetChildSubreaper = 36
// PR_GET_CHILD_SUBREAPER allows retrieving the current child // PR_GET_CHILD_SUBREAPER allows retrieving the current child
// subreaper. // subreaper.
// Return the "child subreaper" setting of the caller, in the // Returns the "child subreaper" setting of the caller, in the
// location pointed to by (int *) arg2. // location pointed to by (int *) arg2.
const prGetChildSubreaper = 37 const prGetChildSubreaper = 37