[PATCH] cifs: remove redundant test in cifs_lookup() and cifs_do_rename()

Roel Kluin <[email protected]>
Newsgroups gmane.linux.kernel,gmane.linux.file-systems.cifs,gmane.network.samba.internals
Message-ID <[email protected]>
rc != -EOPNOTSUPP is true as well if rc is -EINVAL.

Signed-off-by: Roel Kluin <[email protected]>
---
 fs/cifs/dir.c   |    2 +-
 fs/cifs/inode.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Or maybe there is ==/!= or &&/|| confusion?

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 6ccf726..f5cfdd6 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -690,7 +690,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 			 */
 			if ((rc == 0) || (rc == -ENOENT))
 				posix_open = true;
-			else if ((rc == -EINVAL) || (rc != -EOPNOTSUPP))
+			else if (rc != -EOPNOTSUPP)
 				pTcon->broken_posix_open = true;
 		}
 		if (!posix_open)
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index cf18ee7..aec2928 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1264,7 +1264,7 @@ cifs_do_rename(int xid, struct dentry *from_dentry, const char *fromPath,
 	 * source Note that cross directory moves do not work with
 	 * rename by filehandle to various Windows servers.
 	 */
-	if (rc == 0 || rc != -ETXTBSY)
+	if (rc != -ETXTBSY)
 		return rc;
 
 	/* open the file to be renamed -- we need DELETE perms */
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.