Skip to content

Commit

Permalink
cifs: fix fh_mutex locking in cifs_reopen_file
Browse files Browse the repository at this point in the history 
Fixes a regression caused by commit a6ce493

When this lock was converted to a mutex, the locks were turned into
unlocks and vice-versa.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Shirish Pargaonkar <shirishp@us.ibm.com>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
  • Loading branch information
@jtlayton
jtlayton authored and Steve French committed Jun 27, 2009
1 parent 4075ea8 commit f0a71eb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fs/cifs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,9 @@ static int cifs_reopen_file(struct file *file, bool can_flush)
return -EBADF;

xid = GetXid();
mutex_unlock(&pCifsFile->fh_mutex);
mutex_lock(&pCifsFile->fh_mutex);
if (!pCifsFile->invalidHandle) {
mutex_lock(&pCifsFile->fh_mutex);
mutex_unlock(&pCifsFile->fh_mutex);
rc = 0;
FreeXid(xid);
return rc;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit f0a71eb

Please sign in to comment.