Skip to contentSkip to conversation

OCFS2: timer to queue scan of all orphan slots

PATCH New Srinivas Eeda 2 participants 3 messages May 19, 2009 – May 20, 2009 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OCFS2: timer to queue scan of all orphan slots

On unlink, all nodes check for the dentry in dcache and if present they mark the node as unlinked. The last node that purges the inode will clean it from orphan directory. When there is a memory pressure, a dentry may not be around and hence the inode is not marked as deleted and this will lead the file to be in the orphan directory till the slot is re-used during next mount.

This patch initiates periodic recovery on all nodes and makes sure one node runs through all orphan slots every 10(ORPHAN_SCAN_SCHEDULE_TIMEOUT) minutes. This still may not clean the orphan immediately if the inode is still around, but eventually the orphan gets cleaned when the inode is purged.

When the timer is fired, the node acquires OCFS2_LOCK_TYPE_ORPHAN_SCAN lock in EX mode and verifies the recent scan time. It skips if any node did a scan within the last timeout. This is to avoid frequent scans.

---
 fs/ocfs2/dlmglue.c      |   58 +++++++++++++++++++++++++
 fs/ocfs2/dlmglue.h      |    8 +++
 fs/ocfs2/journal.c      |  109 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/ocfs2/journal.h      |   12 +++++
 fs/ocfs2/ocfs2.h        |    2 +
 fs/ocfs2/ocfs2_lockid.h |    5 ++
 fs/ocfs2/super.c        |   11 +++++
 7 files changed, 205 insertions(+), 0 deletions(-)
fs/ocfs2/dlmglue.c +58 -0
index e15fc7d..ed234c8 100644
@@ -248,6 +248,10 @@ static struct ocfs2_lock_res_ops ocfs2_nfs_sync_lops = {
 	.flags		= 0,
 };
 
+static struct ocfs2_lock_res_ops ocfs2_orphan_scan_lops = {
+	.flags		= LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB,
+};
+
 static struct ocfs2_lock_res_ops ocfs2_dentry_lops = {
 	.get_osb	= ocfs2_get_dentry_osb,
 	.post_unlock	= ocfs2_dentry_post_unlock,
@@ -637,6 +641,15 @@ static void ocfs2_nfs_sync_lock_res_init(struct ocfs2_lock_res *res,
 				   &ocfs2_nfs_sync_lops, osb);
 }
 
+static void ocfs2_orphan_scan_lock_res_init(struct ocfs2_lock_res *res,
+					    struct ocfs2_super *osb)
+{
+	ocfs2_lock_res_init_once(res);
+	ocfs2_build_lock_name(OCFS2_LOCK_TYPE_ORPHAN_SCAN, 0, 0, res->l_name);
+	ocfs2_lock_res_init_common(osb, res, OCFS2_LOCK_TYPE_ORPHAN_SCAN,
+				   &ocfs2_orphan_scan_lops, osb);
+}
+
 void ocfs2_file_lock_res_init(struct ocfs2_lock_res *lockres,
 			      struct ocfs2_file_private *fp)
 {
@@ -1978,6 +1991,24 @@ static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode,
 	return 0;
 }
 
+void ocfs2_stuff_meta_lvb_mtime(struct timespec *spec,
+				struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	lvb->lvb_imtime_packed =
+		cpu_to_be64(ocfs2_pack_timespec(spec));
+}
+
+void ocfs2_get_meta_lvb_mtime(struct timespec *spec,
+			      struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+ 
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	ocfs2_unpack_timespec(spec, be64_to_cpu(lvb->lvb_imtime_packed));
+}
+
 /* Determine whether a lock resource needs to be refreshed, and
  * arbitrate who gets to refresh it.
  *
@@ -2352,6 +2383,26 @@ void ocfs2_inode_unlock(struct inode *inode,
 	mlog_exit_void();
 }
 
+int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, int ex)
+{
+	int status = 0;
+	int level = ex ? DLM_LOCK_EX : DLM_LOCK_PR;
+	struct ocfs2_lock_res *lockres;
+
+	lockres = &osb->osb_delayed_orphan_scan->ds_lockres;
+	status = ocfs2_cluster_lock(osb, lockres, level, 0, 0); 
+	return status;
+}
+
+void ocfs2_orphan_scan_unlock(struct ocfs2_super *osb, int ex)
+{
+	int level = ex ? DLM_LOCK_EX : DLM_LOCK_PR;
+	struct ocfs2_lock_res *lockres;
+
+	lockres = &osb->osb_delayed_orphan_scan->ds_lockres;
+	ocfs2_cluster_unlock(osb, lockres, level); 
+}
+
 int ocfs2_super_lock(struct ocfs2_super *osb,
 		     int ex)
 {
@@ -2795,6 +2846,7 @@ int ocfs2_dlm_init(struct ocfs2_super *osb)
 {
 	int status = 0;
 	struct ocfs2_cluster_connection *conn = NULL;
+	struct ocfs2_lock_res *res;
 
 	mlog_entry_void();
 
@@ -2843,6 +2895,9 @@ local:
 	ocfs2_rename_lock_res_init(&osb->osb_rename_lockres, osb);
 	ocfs2_nfs_sync_lock_res_init(&osb->osb_nfs_sync_lockres, osb);
 
+	res = &osb->osb_delayed_orphan_scan->ds_lockres;
+	ocfs2_orphan_scan_lock_res_init(res, osb);
+
 	osb->cconn = conn;
 
 	status = 0;
@@ -2878,6 +2933,7 @@ void ocfs2_dlm_shutdown(struct ocfs2_super *osb,
 	ocfs2_lock_res_free(&osb->osb_super_lockres);
 	ocfs2_lock_res_free(&osb->osb_rename_lockres);
 	ocfs2_lock_res_free(&osb->osb_nfs_sync_lockres);
+	ocfs2_lock_res_free(&osb->osb_delayed_orphan_scan->ds_lockres);
 
 	ocfs2_cluster_disconnect(osb->cconn, hangup_pending);
 	osb->cconn = NULL;
@@ -3061,6 +3117,8 @@ static void ocfs2_drop_osb_locks(struct ocfs2_super *osb)
 	ocfs2_simple_drop_lockres(osb, &osb->osb_super_lockres);
 	ocfs2_simple_drop_lockres(osb, &osb->osb_rename_lockres);
 	ocfs2_simple_drop_lockres(osb, &osb->osb_nfs_sync_lockres);
+	ocfs2_simple_drop_lockres(osb,
+				  &osb->osb_delayed_orphan_scan->ds_lockres);
 }
 
 int ocfs2_drop_inode_locks(struct inode *inode)
fs/ocfs2/dlmglue.h +8 -0
index e1fd572..1ae8842 100644
@@ -62,6 +62,11 @@ struct ocfs2_qinfo_lvb {
 	__be32	lvb_free_entry;
 };
 
+void ocfs2_stuff_meta_lvb_mtime(struct timespec *spec,
+				struct ocfs2_lock_res *lockres);
+void ocfs2_get_meta_lvb_mtime(struct timespec *spec,
+			      struct ocfs2_lock_res *lockres);
+
 /* ocfs2_inode_lock_full() 'arg_flags' flags */
 /* don't wait on recovery. */
 #define OCFS2_META_LOCK_RECOVERY	(0x01)
@@ -113,6 +118,9 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
 		     int ex);
 void ocfs2_super_unlock(struct ocfs2_super *osb,
 			int ex);
+int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, int ex);
+void ocfs2_orphan_scan_unlock(struct ocfs2_super *osb, int ex);
+
 int ocfs2_rename_lock(struct ocfs2_super *osb);
 void ocfs2_rename_unlock(struct ocfs2_super *osb);
 int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex);
fs/ocfs2/journal.c +109 -0

127 lines not on this page · raw message

fs/ocfs2/journal.h +12 -0
index 619dd7f..121df85 100644
@@ -29,6 +29,14 @@
 #include <linux/fs.h>
 #include <linux/jbd2.h>
 
+struct ocfs2_delayed_orphan_scan {
+	struct timespec ds_time;        /* tracks last scan time by any node */
+	struct mutex ds_lock;
+	struct ocfs2_super *ds_osb;
+	struct ocfs2_lock_res ds_lockres;       /* lock to synchronize scans */
+	struct delayed_work ds_delayed_orphan_scan_work;
+};
+
 enum ocfs2_journal_state {
 	OCFS2_JOURNAL_FREE = 0,
 	OCFS2_JOURNAL_LOADED,
@@ -144,6 +152,10 @@ static inline void ocfs2_inode_set_new(struct ocfs2_super *osb,
 }
 
 /* Exported only for the journal struct init code in super.c. Do not call. */
+int ocfs2_delayed_orphan_scan_init(struct ocfs2_super *osb);
+void ocfs2_delayed_orphan_scan_stop(struct ocfs2_super *osb);
+void ocfs2_delayed_orphan_scan_exit(struct ocfs2_super *osb);
+
 void ocfs2_complete_recovery(struct work_struct *work);
 void ocfs2_wait_for_recovery(struct ocfs2_super *osb);
 
fs/ocfs2/ocfs2.h +2 -0
index 1386281..236e80d 100644
@@ -212,6 +212,7 @@ struct ocfs2_recovery_map;
 struct ocfs2_replay_map;
 struct ocfs2_quota_recovery;
 struct ocfs2_dentry_lock;
+struct ocfs2_delayed_orphan_scan;
 struct ocfs2_super
 {
 	struct task_struct *commit_task;
@@ -340,6 +341,7 @@ struct ocfs2_super
 	struct ocfs2_node_map		osb_recovering_orphan_dirs;
 	unsigned int			*osb_orphan_wipes;
 	wait_queue_head_t		osb_wipe_event;
+	struct ocfs2_delayed_orphan_scan *osb_delayed_orphan_scan;
 
 	/* used to protect metaecc calculation check of xattr. */
 	spinlock_t osb_xattr_lock;
fs/ocfs2/ocfs2_lockid.h +5 -0
index a53ce87..978c286 100644
@@ -48,6 +48,7 @@ enum ocfs2_lock_type {
 	OCFS2_LOCK_TYPE_FLOCK,
 	OCFS2_LOCK_TYPE_QINFO,
 	OCFS2_LOCK_TYPE_NFS_SYNC,
+	OCFS2_LOCK_TYPE_ORPHAN_SCAN,
 	OCFS2_NUM_LOCK_TYPES
 };
 
@@ -85,6 +86,9 @@ static inline char ocfs2_lock_type_char(enum ocfs2_lock_type type)
 		case OCFS2_LOCK_TYPE_NFS_SYNC:
 			c = 'Y';
 			break;
+		case OCFS2_LOCK_TYPE_ORPHAN_SCAN:
+			c = 'P';
+			break;
 		default:
 			c = '\0';
 	}
@@ -104,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_ORPHAN_SCAN] = "Orphan",
 };
 
 static inline const char *ocfs2_lock_type_string(enum ocfs2_lock_type type)
fs/ocfs2/super.c +11 -0
index 79ff8d9..f1fbb25 100644
@@ -1802,6 +1802,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
 
 	ocfs2_truncate_log_shutdown(osb);
 
+	ocfs2_delayed_orphan_scan_stop(osb);
+
 	/* This will disable recovery and flush any recovery work. */
 	ocfs2_recovery_exit(osb);
 
@@ -1839,6 +1841,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
 	if (osb->cconn)
 		ocfs2_dlm_shutdown(osb, hangup_needed);
 
+	ocfs2_delayed_orphan_scan_exit(osb);
+
 	debugfs_remove(osb->osb_debug_root);
 
 	if (hangup_needed)
@@ -1957,6 +1961,13 @@ static int ocfs2_initialize_super(struct super_block *sb,
 		goto bail;
 	}
 
+	status = ocfs2_delayed_orphan_scan_init(osb);
+	if (status) {
+		mlog(ML_ERROR, "Unable to initialize delayed orphan scan\n");
+		mlog_errno(status);
+		goto bail;
+	}
+
 	init_waitqueue_head(&osb->checkpoint_event);
 	atomic_set(&osb->needs_checkpoint, 0);
 
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 OCFS2: timer to queue scan of all orphan slots

Quoted 14 lines · Srinivas Eeda

On unlink, all nodes check for the dentry in dcache and if present they mark the node as unlinked. The last node that purges the inode will clean it from orphan directory. When there is a memory pressure, a dentry may not be around and hence the inode is not marked as deleted and this will lead the file to be in the orphan directory till the slot is re-used during next mount.

This patch initiates periodic recovery on all nodes and makes sure one node runs through all orphan slots every 10(ORPHAN_SCAN_SCHEDULE_TIMEOUT) minutes. This still may not clean the orphan immediately if the inode is still around, but eventually the orphan gets cleaned when the inode is purged.

When the timer is fired, the node acquires OCFS2_LOCK_TYPE_ORPHAN_SCAN lock in EX mode and verifies the recent scan time. It skips if any node did a scan within the last timeout. This is to avoid frequent scans.

<snip>

Quoted 7 lines
fs/ocfs2/dlmglue.c +7 -0
+void ocfs2_stuff_meta_lvb_mtime(struct timespec *spec,
+				struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	lvb->lvb_imtime_packed =
+		cpu_to_be64(ocfs2_pack_timespec(spec));

fs/ocfs2/dlmglue.c static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode, · line 2010

Quoted 10 lines
fs/ocfs2/dlmglue.c +10 -0
+}
+
+void ocfs2_get_meta_lvb_mtime(struct timespec *spec,
+			      struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+ 
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	ocfs2_unpack_timespec(spec, be64_to_cpu(lvb->lvb_imtime_packed));
+}

Why not just fold these into the lock code?

ocfs2_orphan_scan_lock(osb, ex, &scan_time);
/* Do work */
scan_time = CURRENT_TIME;
ocfs2_orphan_scan_unlock(osb, ex, &scan_time);

Quoted 6 lines

+/*
+ * ocfs2_queue_delayed_orphan_scan, gets an EX lock on ds_lockres and checks
+ * LVB for recent scan time. If scanned recently than timeout, new scans are
+ * not queued, otherwise it queues recovery of all orphan slots and updates
+ * LVB with CURRENT_TIME
+ * What if the times are not in sync between nodes???

We don't care if the times aren't in sync. So a node is off,
maybe we have two scans within a given timeout. Not the end of the world.

Quoted 14 lines

+ */

fs/ocfs2/journal.c +13 -0
+void ocfs2_queue_delayed_orphan_scan(struct ocfs2_super *osb)
+{
+	struct ocfs2_delayed_orphan_scan *ds;
+	int level = DLM_LOCK_EX;
+	struct timespec scan_time, now;
+	int status, i;
+
+	ds = osb->osb_delayed_orphan_scan;
+	if (!ds)
+		return;
+
+	status = ocfs2_orphan_scan_lock(osb, level);
+	if (status < 0) {

fs/ocfs2/journal.c bail: · line 1881

Quoted 10 lines
fs/ocfs2/journal.c +10 -0
+		if (status != -EAGAIN)
+			mlog_errno(status);
+		goto out;
+	}
+
+	ocfs2_get_meta_lvb_mtime(&scan_time, &ds->ds_lockres);
+	if (ds->ds_time.tv_sec != scan_time.tv_sec) {
+		ds->ds_time = scan_time;
+		goto unlock;
+	}

I don't get this check. It seems to say "only run the scan if
ds_time.tv_sec is equal to the scan_time.tv_sec in the LVB". Is this saying that "after the last scan I see, I want to sleep 60s, and then when I wake up, I'll run the scan only if my time is still in the LVB"? That's not what you want. Each node will come set their own value in the LVB, and they'll all never run the scan.

	What you want is something like:

	now = CURRENT_TIME;
	if ((scan_time.tv_sec + SCAN_TIMEOUT) > now.tv_sec) {
		time_to_sleep = (scan_time + SCAN_TIMEOUT) - now;
		goto unlock;
        } 

This returns 'time_to_sleep' to the caller, who uses it to sleep until the appropriate timeout.

Quoted 13 lines
fs/ocfs2/ocfs2.h +1 -0
index 1386281..236e80d 100644
@@ -212,6 +212,7 @@ struct ocfs2_recovery_map;
 struct ocfs2_replay_map;
 struct ocfs2_quota_recovery;
 struct ocfs2_dentry_lock;
+struct ocfs2_delayed_orphan_scan;
 struct ocfs2_super
 {
 	struct task_struct *commit_task;

fs/ocfs2/ocfs2.h struct ocfs2_super · line 344

Quoted 4 lines
fs/ocfs2/ocfs2.h +1 -0
@@ -340,6 +341,7 @@ struct ocfs2_super
 	struct ocfs2_node_map		osb_recovering_orphan_dirs;
 	unsigned int			*osb_orphan_wipes;
 	wait_queue_head_t		osb_wipe_event;
+	struct ocfs2_delayed_orphan_scan *osb_delayed_orphan_scan;

Why is this an allocated structure when it can just be part of
ocfs2_super?

fs/ocfs2/ocfs2.h static char *ocfs2_lock_type_strings[] = { · line 111

Quoted 5 lines
fs/ocfs2/ocfs2.h +1 -0
@@ -104,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_ORPHAN_SCAN] = "Orphan",

Call it "OphanScan", you never know when we'll have a lock on
orphans directly :-)

Joel

Signature · 8 lines
"I have never let my schooling interfere with my education."
        - Mark Twain

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
#2 lore raw

PATCH 1/1 OCFS2: timer to queue scan of all orphan slots

Joel,
thanks for your comments. My responses are in-line :)

Quoted 21 lines · Joel Becker
Quoted 8 lines
fs/ocfs2/dlmglue.c +7 -0
+void ocfs2_stuff_meta_lvb_mtime(struct timespec *spec,
+				struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	lvb->lvb_imtime_packed =
+		cpu_to_be64(ocfs2_pack_timespec(spec));

fs/ocfs2/dlmglue.c static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode, · line 2010

Quoted 10 lines
fs/ocfs2/dlmglue.c +10 -0
+}
+
+void ocfs2_get_meta_lvb_mtime(struct timespec *spec,
+			      struct ocfs2_lock_res *lockres)
+{
+	struct ocfs2_meta_lvb *lvb;
+ 
+	lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
+	ocfs2_unpack_timespec(spec, be64_to_cpu(lvb->lvb_imtime_packed));
+}

Why not just fold these into the lock code?

Quoted 5 lines

ocfs2_orphan_scan_lock(osb, ex, &scan_time);
/* Do work */
scan_time = CURRENT_TIME;
ocfs2_orphan_scan_unlock(osb, ex, &scan_time);

ok, I'll move the lvb stuff/get to orphan_orphan_scan_lock/unlock routines.

Quoted 37 lines
Quoted 7 lines

+/*
+ * ocfs2_queue_delayed_orphan_scan, gets an EX lock on ds_lockres and checks
+ * LVB for recent scan time. If scanned recently than timeout, new scans are
+ * not queued, otherwise it queues recovery of all orphan slots and updates
+ * LVB with CURRENT_TIME
+ * What if the times are not in sync between nodes???

We don't care if the times aren't in sync. So a node is off,
maybe we have two scans within a given timeout. Not the end of the world.

Quoted 24 lines

+ */

fs/ocfs2/journal.c +23 -0
+void ocfs2_queue_delayed_orphan_scan(struct ocfs2_super *osb)
+{
+	struct ocfs2_delayed_orphan_scan *ds;
+	int level = DLM_LOCK_EX;
+	struct timespec scan_time, now;
+	int status, i;
+
+	ds = osb->osb_delayed_orphan_scan;
+	if (!ds)
+		return;
+
+	status = ocfs2_orphan_scan_lock(osb, level);
+	if (status < 0) {
+		if (status != -EAGAIN)
+			mlog_errno(status);
+		goto out;
+	}
+
+	ocfs2_get_meta_lvb_mtime(&scan_time, &ds->ds_lockres);
+	if (ds->ds_time.tv_sec != scan_time.tv_sec) {
+		ds->ds_time = scan_time;
+		goto unlock;
+	}
Quoted 9 lines
Quoted 1 line

I don't get this check. It seems to say "only run the scan if
ds_time.tv_sec is equal to the scan_time.tv_sec in the LVB". Is this saying that "after the last scan I see, I want to sleep 60s, and then when I wake up, I'll run the scan only if my time is still in the LVB"? That's not what you want. Each node will come set their own value in the LVB, and they'll all never run the scan.

This value is stored in node local structure not in lvb. The timer is fired twice within timeout(once every 15 minutes), on first time, the times doesn't match so the node saves the scan time and skips the scan and on the next time if the times match(means no node did the scan) this node does the scan or else it skips.

This logic allows successive scan to be done by another node and also avoid any race of both nodes trying at the same time.

Quoted 11 lines
	What you want is something like:

	now = CURRENT_TIME;
	if ((scan_time.tv_sec + SCAN_TIMEOUT) > now.tv_sec) {
		time_to_sleep = (scan_time + SCAN_TIMEOUT) - now;
		goto unlock;
        } 

This returns 'time_to_sleep' to the caller, who uses it to sleep until the appropriate timeout.

When you say sleep, you mean schedule_delayed_work(work, time_to_sleep)?

Quoted 13 lines
Quoted 13 lines
fs/ocfs2/ocfs2.h +1 -0
index 1386281..236e80d 100644
@@ -212,6 +212,7 @@ struct ocfs2_recovery_map;
 struct ocfs2_replay_map;
 struct ocfs2_quota_recovery;
 struct ocfs2_dentry_lock;
+struct ocfs2_delayed_orphan_scan;
 struct ocfs2_super
 {
 	struct task_struct *commit_task;
@@ -340,6 +341,7 @@ struct ocfs2_super
Quoted 9 lines

fs/ocfs2/ocfs2.h struct ocfs2_super · line 345

Quoted 5 lines
fs/ocfs2/ocfs2.h +1 -0
 	struct ocfs2_node_map		osb_recovering_orphan_dirs;
 	unsigned int			*osb_orphan_wipes;
 	wait_queue_head_t		osb_wipe_event;
+	struct ocfs2_delayed_orphan_scan *osb_delayed_orphan_scan;
 

Why is this an allocated structure when it can just be part of
ocfs2_super?

I just tried to be in consistent with rest of the code, like ocfs2_recovery_map. But yes, I can move this to ocfs2_super.

Quoted 10 lines

fs/ocfs2/ocfs2.h static char *ocfs2_lock_type_strings[] = { · line 112

Quoted 6 lines
fs/ocfs2/ocfs2.h +1 -0
@@ -104,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_ORPHAN_SCAN] = "Orphan",
 

Call it "OphanScan", you never know when we'll have a lock on
orphans directly :-)

ok, will do :)

Quoted 2 lines

Joel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20090519/fe98ed30/attachment.html