diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-07 20:27:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 20:27:20 +1000 |
| commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
| tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /fs/ocfs2/ocfs2_lockid.h | |
| parent | 575dc34ee0de867ba83abf25998e0963bff451fa (diff) | |
| parent | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 (diff) | |
Merge intel drm-intel-next branch
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'fs/ocfs2/ocfs2_lockid.h')
| -rw-r--r-- | 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 fcdba091af3..c212cf5a2bd 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", }; |