diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /fs/cifs/connect.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index c7d341714586..683dee4d2f76 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -836,8 +836,8 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
| 836 | /* null target name indicates to use *SMBSERVR default called name | 836 | /* null target name indicates to use *SMBSERVR default called name |
| 837 | if we end up sending RFC1001 session initialize */ | 837 | if we end up sending RFC1001 session initialize */ |
| 838 | vol->target_rfc1001_name[0] = 0; | 838 | vol->target_rfc1001_name[0] = 0; |
| 839 | vol->linux_uid = current->uid; /* current->euid instead? */ | 839 | vol->linux_uid = current_uid(); /* use current_euid() instead? */ |
| 840 | vol->linux_gid = current->gid; | 840 | vol->linux_gid = current_gid(); |
| 841 | vol->dir_mode = S_IRWXUGO; | 841 | vol->dir_mode = S_IRWXUGO; |
| 842 | /* 2767 perms indicate mandatory locking support */ | 842 | /* 2767 perms indicate mandatory locking support */ |
| 843 | vol->file_mode = (S_IRWXUGO | S_ISGID) & (~S_IXGRP); | 843 | vol->file_mode = (S_IRWXUGO | S_ISGID) & (~S_IXGRP); |