Framework for version LVB
PATCH 5/6 Framework for version LVB
Use the native DLM locks for version control negotiation. Most of the framework is taken from gfs2/lock_dlm.c
--- fs/ocfs2/stack_user.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
fs/ocfs2/stack_user.c +102 -0
@@ -118,6 +118,9 @@ struct ocfs2_live_connection {enum ocfs2_connection_type oc_type;atomic_t oc_this_node;int oc_our_slot; +struct dlm_lksb oc_version_lksb; +char oc_lvb[DLM_LVB_LEN ]; +struct completion oc_sync_wait; };struct ocfs2_control_private {
@@ -796,6 +799,105 @@ static int fs_protocol_compare(struct ocfs2_protocol_version *existing,return 0 ; } +static int lvb_to_version (char *lvb,struct ocfs2_protocol_version *ver) +{ +struct ocfs2_protocol_version pv; +struct ocfs2_protocol_version *max = + &ocfs2_user_plugin.sp_max_proto; + +memcpy (&pv, lvb,sizeof (struct ocfs2_protocol_version )); +if ((pv.pv_major ==LONG_MIN ) || (pv.pv_major ==LONG_MAX ) || + (pv.pv_major > (u8)-1 ) || (pv.pv_major <1 )) +return -ERANGE ; +if ((pv.pv_minor ==LONG_MIN ) || (pv.pv_minor ==LONG_MAX ) || + (pv.pv_minor > (u8)-1 ) || (pv.pv_minor <0 )) +return -ERANGE ; +if ((pv.pv_major != max->pv_major) || + (pv.pv_minor > max->pv_minor)) +return -EINVAL ; + ver->pv_major = pv.pv_major; + ver->pv_minor = pv.pv_minor; +return 0 ; +} + +static void version_to_lvb (struct ocfs2_protocol_version *ver,char *lvb) +{ +memcpy (lvb, ver,sizeof (struct ocfs2_protocol_version )); +} + +static void sync_wait_cb (void *arg) +{ +struct ocfs2_cluster_connection *conn = arg; +struct ocfs2_live_connection *lc = conn->cc_private; +complete (&lc->oc_sync_wait); +} + +static int sync_unlock (struct ocfs2_cluster_connection *conn, +struct dlm_lksb *lksb,char *name) +{ +int error; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_unlock (conn->cc_lockspace, lksb->sb_lkid,0 , lksb, conn); +if (error) { +printk (KERN_ERR "%s lkid %x error %d\n" , + name, lksb->sb_lkid, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + +if (lksb->sb_status != -DLM_EUNLOCK ) { +printk (KERN_ERR "%s lkid %x status %d\n" , + name, lksb->sb_lkid, lksb->sb_status); +return -1 ; + } +return 0 ; +} + +static int sync_lock (struct ocfs2_cluster_connection *conn, +int mode,uint32_t flags, +struct dlm_lksb *lksb,char *name) +{ +int error, status; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_lock (conn->cc_lockspace, mode, lksb, flags, + name,strlen (name), +0 , sync_wait_cb, conn,NULL ); +if (error) { +printk (KERN_ERR "%s lkid %x flags %x mode %d error %d\n" , + name, lksb->sb_lkid, flags, mode, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + + status = lksb->sb_status; + +if (status && status != -EAGAIN ) { +printk (KERN_ERR "%s lkid %x flags %x mode %d status %d\n" , + name, lksb->sb_lkid, flags, mode, status); + } + +return status; +} + + +static int version_lock (struct ocfs2_cluster_connection *conn,int mode, +int flags) +{ +struct ocfs2_live_connection *lc = conn->cc_private; +return sync_lock (conn, mode, flags, + &lc->oc_version_lksb,"version_lock" ); +} + +static int version_unlock (struct ocfs2_cluster_connection *conn) +{ +struct ocfs2_live_connection *lc = conn->cc_private; +return sync_unlock (conn, &lc->oc_version_lksb,"version_lock" ); +} +static void user_recover_prep (void *arg) { }
Signature · 5 lines
1.8.1.4 -- Goldwyn
PATCH 5/6 Framework for version LVB
Quoted 36 lines · Goldwyn Rodrigues
Use the native DLM locks for version control negotiation. Most of the framework is taken from
gfs2/lock_dlm.cSigned-off-by Goldwyn Rodrigues <[email protected]>--- fs/ocfs2/stack_user.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)fs/ocfs2/stack_user.c +13
-0@@ -118,6 +118,9 @@ struct ocfs2_live_connection {enum ocfs2_connection_type oc_type;atomic_t oc_this_node;int oc_our_slot; +struct dlm_lksb oc_version_lksb; +char oc_lvb[DLM_LVB_LEN ]; +struct completion oc_sync_wait; };struct ocfs2_control_private {@@ -796,6 +799,105 @@ static int fs_protocol_compare(struct ocfs2_protocol_version *existing,return 0 ; } +static int lvb_to_version (char *lvb,struct ocfs2_protocol_version *ver) +{ +struct ocfs2_protocol_version pv; +struct ocfs2_protocol_version *max = + &ocfs2_user_plugin.sp_max_proto; + +memcpy (&pv, lvb,sizeof (struct ocfs2_protocol_version )); +if ((pv.pv_major ==LONG_MIN ) || (pv.pv_major ==LONG_MAX ) || + (pv.pv_major > (u8)-1 ) || (pv.pv_major <1 )) +return -ERANGE ;
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 821
Quoted 10 lines
fs/ocfs2/stack_user.c +10
-0+if ((pv.pv_minor ==LONG_MIN ) || (pv.pv_minor ==LONG_MAX ) || + (pv.pv_minor > (u8)-1 ) || (pv.pv_minor <0 )) +return -ERANGE ; +if ((pv.pv_major != max->pv_major) || + (pv.pv_minor > max->pv_minor)) +return -EINVAL ; + ver->pv_major = pv.pv_major; + ver->pv_minor = pv.pv_minor; +return 0 ; +}
I don't like that lvb_to_version() can return error - I would prefer that validation of the lvb contents happen _outside_ the conversion function. There should actually never be a reason to fail converting an lvb and any corruptions, etc should be caught afterwards.
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 826
Quoted 4 lines
fs/ocfs2/stack_user.c +4
-0+static void version_to_lvb (struct ocfs2_protocol_version *ver,char *lvb) +{ +memcpy (lvb, ver,sizeof (struct ocfs2_protocol_version )); +}
You'll need to account for mixed-endian clusters here and above. Look at ocfs_stuff_meta_lvb() and ocfs2_refresh_inode_from_lvb() to see what I'm talking about. Since the lvb goes over the network we chose a big-endian representation there.
Quoted 56 lines
fs/ocfs2/stack_user.c +56
-0+static void sync_wait_cb (void *arg) +{ +struct ocfs2_cluster_connection *conn = arg; +struct ocfs2_live_connection *lc = conn->cc_private; +complete (&lc->oc_sync_wait); +} + +static int sync_unlock (struct ocfs2_cluster_connection *conn, +struct dlm_lksb *lksb,char *name) +{ +int error; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_unlock (conn->cc_lockspace, lksb->sb_lkid,0 , lksb, conn); +if (error) { +printk (KERN_ERR "%s lkid %x error %d\n" , + name, lksb->sb_lkid, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + +if (lksb->sb_status != -DLM_EUNLOCK ) { +printk (KERN_ERR "%s lkid %x status %d\n" , + name, lksb->sb_lkid, lksb->sb_status); +return -1 ; + } +return 0 ; +} + +static int sync_lock (struct ocfs2_cluster_connection *conn, +int mode,uint32_t flags, +struct dlm_lksb *lksb,char *name) +{ +int error, status; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_lock (conn->cc_lockspace, mode, lksb, flags, + name,strlen (name), +0 , sync_wait_cb, conn,NULL ); +if (error) { +printk (KERN_ERR "%s lkid %x flags %x mode %d error %d\n" , + name, lksb->sb_lkid, flags, mode, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + + status = lksb->sb_status; + +if (status && status != -EAGAIN ) { +printk (KERN_ERR "%s lkid %x flags %x mode %d status %d\n" , + name, lksb->sb_lkid, flags, mode, status); + } + +return status;
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 893
Quoted 10 lines
fs/ocfs2/stack_user.c +10
-0+} + + +static int version_lock (struct ocfs2_cluster_connection *conn,int mode, +int flags) +{ +struct ocfs2_live_connection *lc = conn->cc_private; +return sync_lock (conn, mode, flags, + &lc->oc_version_lksb,"version_lock" ); +}
#define VERSION_LOCK_NAME "version_lock"
and take the "name" argument out of sync_lock().
--Mark
--
Mark Fasheh
PATCH 5/6 Framework for version LVB
Quoted 44 lines · Mark Fasheh
Quoted 43 lines · Goldwyn Rodrigues
Use the native DLM locks for version control negotiation. Most of the framework is taken from
gfs2/lock_dlm.cSigned-off-by Goldwyn Rodrigues <[email protected]>--- fs/ocfs2/stack_user.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)fs/ocfs2/stack_user.c +20
-0@@ -118,6 +118,9 @@ struct ocfs2_live_connection {enum ocfs2_connection_type oc_type;atomic_t oc_this_node;int oc_our_slot; +struct dlm_lksb oc_version_lksb; +char oc_lvb[DLM_LVB_LEN ]; +struct completion oc_sync_wait; };struct ocfs2_control_private {@@ -796,6 +799,105 @@ static int fs_protocol_compare(struct ocfs2_protocol_version *existing,return 0 ; } +static int lvb_to_version (char *lvb,struct ocfs2_protocol_version *ver) +{ +struct ocfs2_protocol_version pv; +struct ocfs2_protocol_version *max = + &ocfs2_user_plugin.sp_max_proto; + +memcpy (&pv, lvb,sizeof (struct ocfs2_protocol_version )); +if ((pv.pv_major ==LONG_MIN ) || (pv.pv_major ==LONG_MAX ) || + (pv.pv_major > (u8)-1 ) || (pv.pv_major <1 )) +return -ERANGE ; +if ((pv.pv_minor ==LONG_MIN ) || (pv.pv_minor ==LONG_MAX ) || + (pv.pv_minor > (u8)-1 ) || (pv.pv_minor <0 )) +return -ERANGE ; +if ((pv.pv_major != max->pv_major) || + (pv.pv_minor > max->pv_minor)) +return -EINVAL ; + ver->pv_major = pv.pv_major;
Quoted 8 lines
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 821
Quoted 3 lines
fs/ocfs2/stack_user.c +3
-0+ ver->pv_minor = pv.pv_minor; +return 0 ; +}I don't like that
lvb_to_version()can return error - I would prefer that validation of the lvb contents happen _outside_ the conversion function. There should actually never be a reason to fail converting an lvb and any corruptions, etc should be caught afterwards.
Ok. Will do.
Quoted 11 lines
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 826
Quoted 6 lines
fs/ocfs2/stack_user.c +4
-0+static void version_to_lvb (struct ocfs2_protocol_version *ver,char *lvb) +{ +memcpy (lvb, ver,sizeof (struct ocfs2_protocol_version )); +}You'll need to account for mixed-endian clusters here and above. Look at
ocfs_stuff_meta_lvb()andocfs2_refresh_inode_from_lvb()to see what I'm talking about. Since the lvb goes over the network we chose a big-endian representation there.
ocfs2_protocol_version has two variables, pv_major and pv_minor both of which are u8 :) Perhaps I could put in a comment if you like.
Quoted 71 lines
Quoted 58 lines
fs/ocfs2/stack_user.c +56
-0+static void sync_wait_cb (void *arg) +{ +struct ocfs2_cluster_connection *conn = arg; +struct ocfs2_live_connection *lc = conn->cc_private; +complete (&lc->oc_sync_wait); +} + +static int sync_unlock (struct ocfs2_cluster_connection *conn, +struct dlm_lksb *lksb,char *name) +{ +int error; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_unlock (conn->cc_lockspace, lksb->sb_lkid,0 , lksb, conn); +if (error) { +printk (KERN_ERR "%s lkid %x error %d\n" , + name, lksb->sb_lkid, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + +if (lksb->sb_status != -DLM_EUNLOCK ) { +printk (KERN_ERR "%s lkid %x status %d\n" , + name, lksb->sb_lkid, lksb->sb_status); +return -1 ; + } +return 0 ; +} + +static int sync_lock (struct ocfs2_cluster_connection *conn, +int mode,uint32_t flags, +struct dlm_lksb *lksb,char *name) +{ +int error, status; +struct ocfs2_live_connection *lc = conn->cc_private; + + error =dlm_lock (conn->cc_lockspace, mode, lksb, flags, + name,strlen (name), +0 , sync_wait_cb, conn,NULL ); +if (error) { +printk (KERN_ERR "%s lkid %x flags %x mode %d error %d\n" , + name, lksb->sb_lkid, flags, mode, error); +return error; + } + +wait_for_completion (&lc->oc_sync_wait); + + status = lksb->sb_status; + +if (status && status != -EAGAIN ) { +printk (KERN_ERR "%s lkid %x flags %x mode %d status %d\n" , + name, lksb->sb_lkid, flags, mode, status); + } + +return status;fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 893
Quoted 10 lines
fs/ocfs2/stack_user.c +10
-0+} + + +static int version_lock (struct ocfs2_cluster_connection *conn,int mode, +int flags) +{ +struct ocfs2_live_connection *lc = conn->cc_private; +return sync_lock (conn, mode, flags, + &lc->oc_version_lksb,"version_lock" ); +}#define
VERSION_LOCK_NAME"version_lock"
Quoted 3 lines
and take the "name" argument out of
sync_lock().--Mark
Understood.
Signature · 1 line
Goldwyn
PATCH 5/6 Framework for version LVB
Quoted 12 lines · Goldwyn Rodrigues
Quoted 10 lines · Mark Fasheh
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 826
Quoted 4 lines · Goldwyn Rodrigues
fs/ocfs2/stack_user.c +4
-0+static void version_to_lvb (struct ocfs2_protocol_version *ver,char *lvb) +{ +memcpy (lvb, ver,sizeof (struct ocfs2_protocol_version )); +}You'll need to account for mixed-endian clusters here and above. Look at
ocfs_stuff_meta_lvb()andocfs2_refresh_inode_from_lvb()to see what I'm talking about. Since the lvb goes over the network we chose a big-endian representation there.
Quoted 2 lines
ocfs2_protocol_versionhas two variables,pv_majorandpv_minorboth of which are u8 :) Perhaps I could put in a comment if you like.
Ok, I feel silly :) A comment doesn't hurt.
Quoted 10 lines
Quoted 10 lines
fs/ocfs2/stack_user.c static int fs_protocol_compare(struct ocfs2_protocol_version *existing, · line 893
Quoted 7 lines
fs/ocfs2/stack_user.c +7
-0+static int version_lock (struct ocfs2_cluster_connection *conn,int mode, +int flags) +{ +struct ocfs2_live_connection *lc = conn->cc_private; +return sync_lock (conn, mode, flags, + &lc->oc_version_lksb,"version_lock" ); +}#define
VERSION_LOCK_NAME"version_lock"
Quoted 5 lines
Quoted 3 lines
and take the "name" argument out of
sync_lock().--MarkUnderstood.
Thanks,
--Mark
--
Mark Fasheh