gfid: changes in mkdir() prototype to have params dictionary with uuid in it

Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com>
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971

4 files changed, 25 insertions, 21 deletions

diff --git a/xlators/features/access-control/src/access-control.c b/xlators/features/access-control/src/access-control.c
index 1601a49526e..159debb3f01 100644
--- a/xlators/features/access-control/src/access-control.c
+++ b/xlators/features/access-control/src/access-control.c
@@ -626,11 +626,12 @@ out:
 }
 
 
-int32_t
-ac_mkdir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
+int
+ac_mkdir_resume (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
+                 dict_t *params)
 {
         STACK_WIND (frame, default_mkdir_cbk, FIRST_CHILD(this),
-                    FIRST_CHILD(this)->fops->mkdir, loc, mode);
+                    FIRST_CHILD(this)->fops->mkdir, loc, mode, params);
         return 0;
 }
 
@@ -670,14 +671,15 @@ out:
 }
 
 
-int32_t
-ac_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
+int
+ac_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
+          dict_t *params)
 {
         call_stub_t     *stub = NULL;
         int             ret = -EFAULT;
         loc_t           parentloc = {0, };
 
-        stub = fop_mkdir_stub (frame, ac_mkdir_resume, loc, mode);
+        stub = fop_mkdir_stub (frame, ac_mkdir_resume, loc, mode, params);
 	if (!stub) {
 		gf_log (this->name, GF_LOG_ERROR, "cannot create call stub: "
                         "(out of memory)");
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index e6b4569006c..002f6b35b51 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -377,7 +377,8 @@ quota_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 
 int
-quota_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
+quota_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
+             dict_t *params)
 {
 	struct quota_priv *priv = NULL;
 
@@ -405,7 +406,7 @@ quota_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
 	STACK_WIND (frame, quota_mkdir_cbk,
 		    FIRST_CHILD(this),
 		    FIRST_CHILD(this)->fops->mkdir,
-		    loc, mode);
+		    loc, mode, params);
 
 	return 0;
 }
diff --git a/xlators/features/read-only/src/read-only.c b/xlators/features/read-only/src/read-only.c
index 0c1b06e781e..9ebbdaaba0f 100644
--- a/xlators/features/read-only/src/read-only.c
+++ b/xlators/features/read-only/src/read-only.c
@@ -122,8 +122,9 @@ ro_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
 }
 
 
-int32_t
-ro_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode)
+int
+ro_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
+          dict_t *params)
 {
         STACK_UNWIND_STRICT (mkdir, frame, -1, EROFS, NULL, NULL, NULL, NULL);
         return 0;
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
index dd61929d7ff..1fb4377bad3 100644
--- a/xlators/features/trash/src/trash.c
+++ b/xlators/features/trash/src/trash.c
@@ -124,7 +124,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_unlink_mkdir_cbk, tmp_path,
                                    this->children->xlator,
                                    this->children->xlator->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
 
                 goto out;
         }
@@ -166,7 +166,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         STACK_WIND_COOKIE (frame, trash_unlink_mkdir_cbk, tmp_path,
                            this->children->xlator,
                            this->children->xlator->fops->mkdir,
-                           &tmp_loc, 0755);
+                           &tmp_loc, 0755, NULL);
 
 out:
         GF_FREE (cookie);
@@ -215,7 +215,7 @@ trash_unlink_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_unlink_mkdir_cbk, tmp_cookie,
                                    FIRST_CHILD(this),
                                    FIRST_CHILD(this)->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
 
                 GF_FREE (tmp_str);
 
@@ -360,7 +360,7 @@ trash_rename_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_rename_mkdir_cbk, tmp_path,
                                    this->children->xlator,
                                    this->children->xlator->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
 
                 GF_FREE (tmp_str);
                 return 0;
@@ -426,7 +426,7 @@ trash_rename_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         STACK_WIND_COOKIE (frame, trash_rename_mkdir_cbk,
                                            tmp_path,  this->children->xlator,
                                            this->children->xlator->fops->mkdir,
-                                           &tmp_loc, 0755);
+                                           &tmp_loc, 0755, NULL);
                 }
 
                 goto out;
@@ -805,7 +805,7 @@ trash_truncate_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_truncate_mkdir_cbk,
                                    tmp_path, FIRST_CHILD(this),
                                    FIRST_CHILD(this)->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
                 GF_FREE (tmp_str);
                 goto out;
         }
@@ -883,7 +883,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_truncate_mkdir_cbk,
                                    tmp_path, this->children->xlator,
                                    this->children->xlator->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
 
                 goto out;
         }
@@ -930,7 +930,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         STACK_WIND_COOKIE (frame, trash_truncate_mkdir_cbk, tmp_path,
                            this->children->xlator,
                            this->children->xlator->fops->mkdir,
-                           &tmp_loc, 0755);
+                           &tmp_loc, 0755, NULL);
 
 out:
         GF_FREE (cookie); /* strdup (dir_name) was sent here :) */
@@ -1182,7 +1182,7 @@ trash_ftruncate_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_truncate_mkdir_cbk,
                                    tmp_path, FIRST_CHILD(this),
                                    FIRST_CHILD(this)->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
                 GF_FREE (tmp_str);
                 return 0;
         }
@@ -1251,7 +1251,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 STACK_WIND_COOKIE (frame, trash_ftruncate_mkdir_cbk,
                                    tmp_path, this->children->xlator,
                                    this->children->xlator->fops->mkdir,
-                                   &tmp_loc, 0755);
+                                   &tmp_loc, 0755, NULL);
 
                 goto out;
         }
@@ -1298,7 +1298,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         STACK_WIND_COOKIE (frame, trash_ftruncate_mkdir_cbk, tmp_path,
                            this->children->xlator,
                            this->children->xlator->fops->mkdir,
-                           &tmp_loc, 0755);
+                           &tmp_loc, 0755, NULL);
 
 out:
         GF_FREE (cookie); /* strdup (dir_name) was sent here :) */