From fd2e7d007e5362f0738cd9a825349abcf5d27d8f Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Fri, 1 Oct 2010 05:45:12 +0000 Subject: Changes to replace flock with gf_flock across GlusterFS. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Vijay Bellur BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865 --- xlators/storage/bdb/src/bdb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/storage/bdb') diff --git a/xlators/storage/bdb/src/bdb.c b/xlators/storage/bdb/src/bdb.c index 6104728e3db..3b48fe4a45c 100644 --- a/xlators/storage/bdb/src/bdb.c +++ b/xlators/storage/bdb/src/bdb.c @@ -713,9 +713,9 @@ bdb_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, - struct flock *lock) + struct gf_flock *lock) { - struct flock nullock = {0, }; + struct gf_flock nullock = {0, }; if (BDB_TIMED_LOG (ENOTSUP, gf_bdb_lk_log)) { gf_log (this->name, GF_LOG_DEBUG, @@ -3050,7 +3050,7 @@ out: int32_t bdb_inodelk (call_frame_t *frame, xlator_t *this, - const char *volume, loc_t *loc, int32_t cmd, struct flock *lock) + const char *volume, loc_t *loc, int32_t cmd, struct gf_flock *lock) { gf_log (this->name, GF_LOG_ERROR, "glusterfs internal locking request. please load " @@ -3064,7 +3064,7 @@ bdb_inodelk (call_frame_t *frame, xlator_t *this, int32_t bdb_finodelk (call_frame_t *frame, xlator_t *this, - const char *volume, fd_t *fd, int32_t cmd, struct flock *lock) + const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock) { gf_log (this->name, GF_LOG_ERROR, "glusterfs internal locking request. please load " -- cgit