There is missing name for NFSSync cluster lock. This makes lockdep unhappy
because we end up passing NULL to lockdep when initializing lock key. Fix it.
Signed-off-by: Jan Kara <jack at suse.cz>
---
fs/ocfs2/ocfs2_lockid.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h
index fcdba09..c212cf5 100644
--- a/fs/ocfs2/ocfs2_lockid.h
+++ b/fs/ocfs2/ocfs2_lockid.h
@@ -108,6 +108,7 @@ static char *ocfs2_lock_type_strings[] = {
[OCFS2_LOCK_TYPE_OPEN] = "Open",
[OCFS2_LOCK_TYPE_FLOCK] = "Flock",
[OCFS2_LOCK_TYPE_QINFO] = "Quota",
+ [OCFS2_LOCK_TYPE_NFS_SYNC] = "NFSSync",
[OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan",
};
--
1.6.0.2
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com> Jan Kara wrote:> There is missing name for NFSSync cluster lock. This makes lockdep unhappy > because we end up passing NULL to lockdep when initializing lock key. Fix it. > > Signed-off-by: Jan Kara <jack at suse.cz> > --- > fs/ocfs2/ocfs2_lockid.h | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h > index fcdba09..c212cf5 100644 > --- a/fs/ocfs2/ocfs2_lockid.h > +++ b/fs/ocfs2/ocfs2_lockid.h > @@ -108,6 +108,7 @@ static char *ocfs2_lock_type_strings[] = { > [OCFS2_LOCK_TYPE_OPEN] = "Open", > [OCFS2_LOCK_TYPE_FLOCK] = "Flock", > [OCFS2_LOCK_TYPE_QINFO] = "Quota", > + [OCFS2_LOCK_TYPE_NFS_SYNC] = "NFSSync", > [OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan", > }; > >
On Thu, Aug 20, 2009 at 06:26:52PM +0200, Jan Kara wrote:> There is missing name for NFSSync cluster lock. This makes lockdep unhappy > because we end up passing NULL to lockdep when initializing lock key. Fix it.This is now part of the fixes branch of ocfs2.git. Joel -- "Not everything that can be counted counts, and not everything that counts can be counted." - Albert Einstein Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127