From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch for 2.6.29? 3/3] vfs: add missing unlock in sget() Date: Wed, 04 Mar 2009 12:12:32 -0800 Message-ID: <200903042012.n24KCWhC030028@imap1.linux-foundation.org> Cc: linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org, lizf@cn.fujitsu.com, a.p.zijlstra@chello.nl, menage@google.com, viro@zeniv.linux.org.uk To: viro@zeniv.linux.org.uk Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:58401 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756467AbZCDU0q (ORCPT ); Wed, 4 Mar 2009 15:26:46 -0500 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Li Zefan In sget(), destroy_super(s) is called with s->s_umount held, which makes lockdep unhappy. Signed-off-by: Li Zefan Cc: Al Viro Acked-by: Peter Zijlstra Cc: Paul Menage Signed-off-by: Andrew Morton --- fs/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN fs/super.c~vfs-add-missing-unlock-in-sget fs/super.c --- a/fs/super.c~vfs-add-missing-unlock-in-sget +++ a/fs/super.c @@ -357,8 +357,10 @@ retry: continue; if (!grab_super(old)) goto retry; - if (s) + if (s) { + up_write(&s->s_umount); destroy_super(s); + } return old; } } @@ -373,6 +375,7 @@ retry: err = set(s, data); if (err) { spin_unlock(&sb_lock); + up_write(&s->s_umount); destroy_super(s); return ERR_PTR(err); } _