diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /fs/smbfs/proc.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'fs/smbfs/proc.c')
| -rw-r--r-- | fs/smbfs/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index 38ab558835c4..d6baec0f24ad 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c | |||
| @@ -3113,7 +3113,7 @@ smb_proc_setattr_unix(struct dentry *d, struct iattr *attr, | |||
| 3113 | LSET(data, 32, SMB_TIME_NO_CHANGE); | 3113 | LSET(data, 32, SMB_TIME_NO_CHANGE); |
| 3114 | LSET(data, 40, SMB_UID_NO_CHANGE); | 3114 | LSET(data, 40, SMB_UID_NO_CHANGE); |
| 3115 | LSET(data, 48, SMB_GID_NO_CHANGE); | 3115 | LSET(data, 48, SMB_GID_NO_CHANGE); |
| 3116 | LSET(data, 56, smb_filetype_from_mode(attr->ia_mode)); | 3116 | DSET(data, 56, smb_filetype_from_mode(attr->ia_mode)); |
| 3117 | LSET(data, 60, major); | 3117 | LSET(data, 60, major); |
| 3118 | LSET(data, 68, minor); | 3118 | LSET(data, 68, minor); |
| 3119 | LSET(data, 76, 0); | 3119 | LSET(data, 76, 0); |