remove spurious logging of message on "create if file does not exist" case (without...

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 1905748d3b584853a90179cba95f51d9da067985..153a4b0ff288663b1c5ebe0093e18e8ed0544b91 100644 (file)
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,6 +1,7 @@
 Version 0.89
 ------------
-Fix oops on write to dead tcp session.
+Fix oops on write to dead tcp session. Remove error log write for case when file open
+O_CREAT but not O_EXCL
 
 Version 0.88
 ------------

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0b8bb170f7aaccaf3e56acc4a1321bbb418442f7..917cdad9519fca347c62c6fae7c5e74cc19e82ac 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -76,13 +76,14 @@ cifs_open(struct inode *inode, struct file *file)
                FreeXid(xid);
                return rc;
            } else {
-               cERROR(1,("could not find file instance for new file %p ",file));
+               if(file->f_flags & O_EXCL)
+                       cERROR(1,("could not find file instance for new file %p ",file));
            }
        }
 
        full_path = build_path_from_dentry(file->f_dentry);
 
-       cFYI(1, (" inode = 0x%p file flags are %x for %s", inode, file->f_flags,full_path));
+       cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path));
        if ((file->f_flags & O_ACCMODE) == O_RDONLY)
                desiredAccess = GENERIC_READ;
        else if ((file->f_flags & O_ACCMODE) == O_WRONLY)