[PVFS2-CVS]
commit by neill in pvfs2/src/server: crdirent.sm create.sm
remove.sm rmdirent.sm set-attr.sm
CVS commit program
cvs at parl.clemson.edu
Wed Feb 18 14:40:32 EST 2004
Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb:/tmp/cvs-serv8797/src/server
Modified Files:
crdirent.sm create.sm remove.sm rmdirent.sm set-attr.sm
Log Message:
- okay, some more cleanups and removals of hardcoded TROVE_SYNC flags
Index: crdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/crdirent.sm,v
diff -p -u -r1.32 -r1.33
--- crdirent.sm 18 Feb 2004 17:38:29 -0000 1.32
+++ crdirent.sm 18 Feb 2004 19:40:32 -0000 1.33
@@ -281,8 +281,8 @@ static int crdirent_create_dirdata_dspac
&extent_array,
PVFS_TYPE_DIRDATA,
NULL,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.crdirent.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.crdirent.fs_id),
s_op,
0,
js_p,
@@ -343,8 +343,8 @@ static int crdirent_write_dirdata_handle
s_op->req->u.crdirent.parent_handle,
&s_op->key,
&s_op->val,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.crdirent.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.crdirent.fs_id),
NULL,
s_op,
0,
@@ -407,8 +407,8 @@ static int crdirent_write_directory_entr
s_op->u.crdirent.dirent_handle,
&s_op->key,
&s_op->val,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.crdirent.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.crdirent.fs_id),
NULL,
s_op,
0,
Index: create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/create.sm,v
diff -p -u -r1.33 -r1.34
--- create.sm 16 Feb 2004 23:08:22 -0000 1.33
+++ create.sm 18 Feb 2004 19:40:32 -0000 1.34
@@ -71,7 +71,6 @@ machine pvfs2_create_sm(prelude, create2
*/
static int create_create(PINT_server_op *s_op, job_status_s* js_p)
{
-
int ret = -1;
job_id_t i;
struct server_configuration_s *user_opts = get_server_config_struct();
Index: remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/remove.sm,v
diff -p -u -r1.34 -r1.35
--- remove.sm 18 Feb 2004 17:38:29 -0000 1.34
+++ remove.sm 18 Feb 2004 19:40:32 -0000 1.35
@@ -275,8 +275,8 @@ static int remove_remove_dirdata_dspace(
ret = job_trove_dspace_remove(
s_op->req->u.remove.fs_id,
s_op->u.remove.dirdata_handle,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.remove.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.remove.fs_id),
s_op,
0,
js_p,
@@ -304,8 +304,8 @@ static int remove_remove_dspace(PINT_ser
ret = job_trove_dspace_remove(
s_op->req->u.remove.fs_id,
s_op->req->u.remove.handle,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.remove.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.remove.fs_id),
s_op,
0,
js_p,
Index: rmdirent.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/rmdirent.sm,v
diff -p -u -r1.32 -r1.33
--- rmdirent.sm 18 Feb 2004 17:38:29 -0000 1.32
+++ rmdirent.sm 18 Feb 2004 19:40:32 -0000 1.33
@@ -250,8 +250,8 @@ static int rmdirent_remove_directory_ent
s_op->req->u.rmdirent.fs_id,
s_op->u.rmdirent.dirdata_handle,
&s_op->key,
- (PINT_config_get_trove_sync_mode(
- user_opts, s_op->req->u.rmdirent.fs_id) | TROVE_SYNC),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.rmdirent.fs_id),
NULL,
s_op,
0,
Index: set-attr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/set-attr.sm,v
diff -p -u -r1.44 -r1.45
--- set-attr.sm 16 Feb 2004 23:08:22 -0000 1.44
+++ set-attr.sm 18 Feb 2004 19:40:32 -0000 1.45
@@ -338,6 +338,7 @@ static int setattr_write_metafile_datafi
{
int ret = 0, dfile_count = 0;
job_id_t j_id;
+ struct server_configuration_s *user_opts = get_server_config_struct();
PINT_STATE_DEBUG("write_metafile_datafile_handles_if_needed");
@@ -386,17 +387,19 @@ static int setattr_write_metafile_datafi
s_op->val.buffer,
s_op->val.buffer_sz);
- ret = job_trove_keyval_write(s_op->req->u.setattr.fs_id,
- s_op->req->u.setattr.handle,
- &(s_op->key),
- &(s_op->val),
- TROVE_SYNC /* flags */,
- NULL,
- s_op,
- 0,
- js_p,
- &j_id,
- server_job_context);
+ ret = job_trove_keyval_write(
+ s_op->req->u.setattr.fs_id,
+ s_op->req->u.setattr.handle,
+ &(s_op->key),
+ &(s_op->val),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.setattr.fs_id),
+ NULL,
+ s_op,
+ 0,
+ js_p,
+ &j_id,
+ server_job_context);
return ret;
}
@@ -406,6 +409,7 @@ static int setattr_write_metafile_distri
{
int ret = 0;
job_id_t j_id;
+ struct server_configuration_s *user_opts = get_server_config_struct();
PINT_STATE_DEBUG("write_metafile_distribution_if_required");
@@ -445,17 +449,20 @@ static int setattr_write_metafile_distri
s_op->val.buffer,
s_op->val.buffer_sz);
- ret = job_trove_keyval_write(s_op->req->u.setattr.fs_id,
- s_op->req->u.setattr.handle,
- &(s_op->key),
- &(s_op->val),
- TROVE_SYNC /* flags */,
- NULL,
- s_op,
- 0,
- js_p,
- &j_id,
- server_job_context);
+ ret = job_trove_keyval_write(
+ s_op->req->u.setattr.fs_id,
+ s_op->req->u.setattr.handle,
+ &(s_op->key),
+ &(s_op->val),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.setattr.fs_id),
+ NULL,
+ s_op,
+ 0,
+ js_p,
+ &j_id,
+ server_job_context);
+
return(ret);
}
@@ -464,6 +471,7 @@ static int setattr_write_symlink_target_
{
int ret = 0;
job_id_t j_id;
+ struct server_configuration_s *user_opts = get_server_config_struct();
PINT_STATE_DEBUG("write_symlink_target_if_required");
@@ -500,17 +508,20 @@ static int setattr_write_symlink_target_
s_op->val.buffer,
s_op->val.buffer_sz);
- ret = job_trove_keyval_write(s_op->req->u.setattr.fs_id,
- s_op->req->u.setattr.handle,
- &(s_op->key),
- &(s_op->val),
- TROVE_SYNC /* flags */,
- NULL,
- s_op,
- 0,
- js_p,
- &j_id,
- server_job_context);
+ ret = job_trove_keyval_write(
+ s_op->req->u.setattr.fs_id,
+ s_op->req->u.setattr.handle,
+ &(s_op->key),
+ &(s_op->val),
+ PINT_config_get_trove_sync_mode(
+ user_opts, s_op->req->u.setattr.fs_id),
+ NULL,
+ s_op,
+ 0,
+ js_p,
+ &j_id,
+ server_job_context);
+
return ret;
}
More information about the PVFS2-CVS
mailing list