Re: [PATCH] ceph: unlock dangling spinlock in try_flush_caps

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Oct 19, 2017 at 2:52 PM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> From: Jeff Layton <jlayton@xxxxxxxxxx>
>
> sparose warns:
>     fs/ceph/caps.c:2042:9: warning: context imbalance in 'try_flush_caps' - wrong count at exit
>
> We need to exit this function with the lock unlocked, but a couple of
> cases leave it locked.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
>  fs/ceph/caps.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
> index 157fe59fbabe..1978a8cb1cb1 100644
> --- a/fs/ceph/caps.c
> +++ b/fs/ceph/caps.c
> @@ -1991,6 +1991,7 @@ static int try_flush_caps(struct inode *inode, u64 *ptid)
>  retry:
>         spin_lock(&ci->i_ceph_lock);
>         if (ci->i_ceph_flags & CEPH_I_NOFLUSH) {
> +               spin_unlock(&ci->i_ceph_lock);
>                 dout("try_flush_caps skipping %p I_NOFLUSH set\n", inode);
>                 goto out;
>         }
> @@ -2008,8 +2009,10 @@ static int try_flush_caps(struct inode *inode, u64 *ptid)
>                         mutex_lock(&session->s_mutex);
>                         goto retry;
>                 }
> -               if (cap->session->s_state < CEPH_MDS_SESSION_OPEN)
> +               if (cap->session->s_state < CEPH_MDS_SESSION_OPEN) {
> +                       spin_unlock(&ci->i_ceph_lock);
>                         goto out;
> +               }
>
>                 flushing = __mark_caps_flushing(inode, session, true,
>                                                 &flush_tid, &oldest_flush_tid);

Applied.

Thanks,

                Ilya
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux