From bdb3276bb60e62aba4e570c3c1eee29460c410d0 Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 25 Nov 2009 00:11:31 +0000 Subject: [PATCH] --- yaml --- r: 169004 b: refs/heads/master c: 2f81e752da4781fc276689fc14391346d0dbbe78 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 9 +++++++++ trunk/fs/cifs/dir.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 18a1bc156df7..d82631499ff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cea62343956c24452700c06cf028b72414c58a74 +refs/heads/master: 2f81e752da4781fc276689fc14391346d0dbbe78 diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 145540a316ab..094ea65afc85 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/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/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c index d3a6b07e3355..1f42f772865a 100644 --- a/trunk/fs/cifs/dir.c +++ b/trunk/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