diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-07 23:25:02 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-07 23:25:02 +0000 |
| commit | ad7a2926b9e53cfb3020d15bdfacacc54e2b63da (patch) | |
| tree | f4cf20d2bc3a13841ed81a8de25bd870a3b622e6 /fs/cifs/cifsacl.c | |
| parent | f315ccb3e679f271583f2a4f463ad9b65665b751 (diff) | |
| download | lwn-ad7a2926b9e53cfb3020d15bdfacacc54e2b63da.tar.gz lwn-ad7a2926b9e53cfb3020d15bdfacacc54e2b63da.zip | |
[CIFS] reduce checkpatch warnings
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsacl.c')
| -rw-r--r-- | fs/cifs/cifsacl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index a7035bd18e4e..842aaa92168d 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -46,8 +46,7 @@ static struct cifs_wksid wksidarr[NUM_WK_SIDS] = { static const struct cifs_sid sid_everyone = { 1, 1, {0, 0, 0, 0, 0, 1}, {0} }; /* group users */ -static const struct cifs_sid sid_user = - {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; +static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} }; int match_sid(struct cifs_sid *ctsid) @@ -195,9 +194,9 @@ static void access_flags_to_mode(__le32 ace_flags, int type, umode_t *pmode, /* For deny ACEs we change the mask so that subsequent allow access control entries do not turn on the bits we are denying */ if (type == ACCESS_DENIED) { - if (flags & GENERIC_ALL) { + if (flags & GENERIC_ALL) *pbits_to_set &= ~S_IRWXUGO; - } + if ((flags & GENERIC_WRITE) || ((flags & FILE_WRITE_RIGHTS) == FILE_WRITE_RIGHTS)) *pbits_to_set &= ~S_IWUGO; |