Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (4142ac67) · Commits · e / devices / android_kernel_teracube_2e

fs/cifs/file.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -493,9 +493,9 @@ static int cifs_reopen_file(struct file *file, bool can_flush)
		return -EBADF;

		xid = GetXid();
		mutex_unlock(&pCifsFile->fh_mutex);
		if (!pCifsFile->invalidHandle) {
		mutex_lock(&pCifsFile->fh_mutex);
		if (!pCifsFile->invalidHandle) {
		mutex_unlock(&pCifsFile->fh_mutex);
		rc = 0;
		FreeXid(xid);
		return rc;
		@@ -527,7 +527,7 @@ static int cifs_reopen_file(struct file *file, bool can_flush)
		if (full_path == NULL) {
		rc = -ENOMEM;
		reopen_error_exit:
		mutex_lock(&pCifsFile->fh_mutex);
		mutex_unlock(&pCifsFile->fh_mutex);
		FreeXid(xid);
		return rc;
		}
		@@ -569,14 +569,14 @@ static int cifs_reopen_file(struct file *file, bool can_flush)
		cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
		CIFS_MOUNT_MAP_SPECIAL_CHR);
		if (rc) {
		mutex_lock(&pCifsFile->fh_mutex);
		mutex_unlock(&pCifsFile->fh_mutex);
		cFYI(1, ("cifs_open returned 0x%x", rc));
		cFYI(1, ("oplock: %d", oplock));
		} else {
		reopen_success:
		pCifsFile->netfid = netfid;
		pCifsFile->invalidHandle = false;
		mutex_lock(&pCifsFile->fh_mutex);
		mutex_unlock(&pCifsFile->fh_mutex);
		pCifsInode = CIFS_I(inode);
		if (pCifsInode) {
		if (can_flush) {