nfsd4: set shorter timeout

[safe/jmp/linux-2.6] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 48c9ae0..50ca088 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -307,11 +307,9 @@ int cifs_open(struct inode *inode, struct file *file)
                rc = 0;
                FreeXid(xid);
                return rc;
-       } else {
-               if ((file->f_flags & O_CREAT) && (file->f_flags & O_EXCL))
+       } else if ((file->f_flags & O_CREAT) && (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_path.dentry);
        if (full_path == NULL) {