From: Steve French <smfrench@gmail.com>
To: Jeff Layton <jlayton@redhat.com>
Cc: linux-cifs-client@lists.samba.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] cifs: fix fh_mutex locking in cifs_reopen_file
Date: Sat, 27 Jun 2009 19:10:14 -0500 [thread overview]
Message-ID: <524f69650906271710n663e4f21x106b5deaa81e20c0@mail.gmail.com> (raw)
In-Reply-To: <1246100695-10344-1-git-send-email-jlayton@redhat.com>
Good catch .
I have reviewed and merged into cifs-2.6.git. Merge requested for upstream.
On Sat, Jun 27, 2009 at 6:04 AM, Jeff Layton<jlayton@redhat.com> wrote:
> Fixes a regression caused by commit a6ce4932fbdbcd8f8e8c6df76812014351c32892
>
> 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>
> Cc: Stable Tree <stable@kernel.org>
> ---
> fs/cifs/file.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index ebdbe62..97ce4bf 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -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;
> @@ -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 @@ reopen_error_exit:
> 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) {
> --
> 1.6.0.6
>
>
--
Thanks,
Steve
next prev parent reply other threads:[~2009-06-28 0:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-27 11:04 Jeff Layton
2009-06-28 0:10 ` Steve French [this message]
2009-06-28 1:23 ` [linux-cifs-client] " Jeff Layton
2009-06-28 16:43 ` Steve French
2009-06-28 19:02 ` Steve French
2009-06-28 23:18 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524f69650906271710n663e4f21x106b5deaa81e20c0@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=jlayton@redhat.com \
--cc=linux-cifs-client@lists.samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®