diff options
author | Steve French <sfrench@us.ibm.com> | 2009-11-25 00:11:31 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-11-25 00:11:31 +0000 |
commit | 2f81e752da4781fc276689fc14391346d0dbbe78 (patch) | |
tree | 02c40374f22919e49b87242b44556362053e85b2 | |
parent | cea62343956c24452700c06cf028b72414c58a74 (diff) | |
download | op-kernel-dev-2f81e752da4781fc276689fc14391346d0dbbe78.zip op-kernel-dev-2f81e752da4781fc276689fc14391346d0dbbe78.tar.gz |
[CIFS] Fix sparse warning
Also update CHANGES file
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/CHANGES | 9 | ||||
-rw-r--r-- | fs/cifs/dir.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 145540a..094ea65 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES @@ -1,3 +1,12 @@ +Version 1.61 +------------ +Fix append problem to Samba servers (files opened with O_APPEND could +have duplicated data). Fix oops in cifs_lookup. Workaround problem +mounting to OS/400 Netserve. Fix oops in cifs_get_tcp_session. +Disable use of server inode numbers when server only +partially supports them (e.g. for one server querying inode numbers on +FindFirst fails but QPathInfo queries works). + Version 1.60 ------------- Fix memory leak in reconnect. Fix oops in DFS mount error path. diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d3a6b07..1f42f77 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -643,7 +643,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, */ if (nd && (nd->flags & LOOKUP_EXCL)) { d_instantiate(direntry, NULL); - return 0; + return NULL; } /* can not grab the rename sem here since it would |