cifs: consolidate error handling in several functions (232341ba) · Commits · 戴 / test

cifs has a lot of complicated functions that have to clean up things on error, but some of them don't have all of the cleanup code well-consolidated. Clean up and consolidate error handling in several functions. This is in preparation of later patches that will need to put references to the tcon link container. Signed-off-by:

Jeff Layton <jlayton@redhat.com> Signed-off-by:

Steve French <sfrench@us.ibm.com>

fs/cifs/dir.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -305,8 +305,7 @@ cifs_create(struct inode inode, struct dentry direntry, int mode,
		full_path = build_path_from_dentry(direntry);
		if (full_path == NULL) {
		rc = -ENOMEM;
		FreeXid(xid);
		return rc;
		goto cifs_create_out;
		}

		if (oplockEnabled)
		@@ -365,9 +364,8 @@ cifs_create(struct inode inode, struct dentry direntry, int mode,

		buf = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL);
		if (buf == NULL) {
		kfree(full_path);
		FreeXid(xid);
		return -ENOMEM;
		rc = -ENOMEM;
		goto cifs_create_out;
		}

		/*

fs/cifs/file.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -242,8 +242,7 @@ int cifs_open(struct inode inode, struct file file)
		full_path = build_path_from_dentry(file->f_path.dentry);
		if (full_path == NULL) {
		rc = -ENOMEM;
		FreeXid(xid);
		return rc;
		goto out;
		}

		cFYI(1, "inode = 0x%p file flags are 0x%x for %s",

Admin message