diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-15 01:33:18 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-15 01:33:18 +0000 |
| commit | c14e894bd40868d6d1f2379705b68acf5288ba27 (patch) | |
| tree | 66fb62dee94cdb23d941c3db7faca48bba44b35d /fs | |
| parent | 86a71dbd3e81e8870d0f0e56b87875f57e58222b (diff) | |
| download | linux-stable-c14e894bd40868d6d1f2379705b68acf5288ba27.tar.gz linux-stable-c14e894bd40868d6d1f2379705b68acf5288ba27.tar.bz2 linux-stable-c14e894bd40868d6d1f2379705b68acf5288ba27.zip | |
[CIFS] fix &&/& typo in cifs_setattr()
Thanks to Dirk for pointing this out.
Signed-off-by: Dirk Mueller <dmueller@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifspdu.h | 8 | ||||
| -rw-r--r-- | fs/cifs/inode.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 7d9505491b16..2498d644827c 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -35,9 +35,11 @@ #define BAD_PROT 0xFFFF /* SMB command codes */ -/* Some commands have minimal (wct=0,bcc=0), or uninteresting, responses - (ie which include no useful data other than the SMB error code itself). - Knowing this helps avoid response buffer allocations and copy in some cases */ +/* + * Some commands have minimal (wct=0,bcc=0), or uninteresting, responses + * (ie which include no useful data other than the SMB error code itself). + * Knowing this helps avoid response buffer allocations and copy in some cases + */ #define SMB_COM_CREATE_DIRECTORY 0x00 /* trivial response */ #define SMB_COM_DELETE_DIRECTORY 0x01 /* trivial response */ #define SMB_COM_CLOSE 0x04 /* triv req/rsp, timestamp ignored */ diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 3f5bc83dc3d1..e203f63c66d5 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1359,7 +1359,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) and this check ensures that we are not being called from sys_utimes in which case we ought to fail the call back to the user when the server rejects the call */ - if((rc) && (attrs->ia_valid && + if((rc) && (attrs->ia_valid & (ATTR_MODE | ATTR_GID | ATTR_UID | ATTR_SIZE))) rc = 0; } |