fixed branch messup

Author: sbk173

libglusterfs/src/glusterfs/inode.h

@@ -111,7 +111,6 @@ struct _inode {
     struct list_head dentry_list; /* list of directory entries for this inode */
     struct list_head hash;        /* hash table pointers */
     struct list_head list;        /* active/lru/purge */
-    uintptr_t read_mask;
 
     struct _inode *ns_inode;  /* This inode would point to namespace inode */
     bool in_invalidate_list;  /* Set if inode is in table invalidate list */

xlators/cluster/ec/src/ec-inode-read.c

@@ -1379,9 +1379,6 @@ ec_manager_readv(ec_fop_data_t *fop, int32_t state)
             if (ec->read_mask) {
                 fop->mask &= ec->read_mask;
             }
-            if (fop->fd->inode->read_mask != 0){
-                fop->mask &= fop->fd->inode->read_mask;
-            }
             ec_dispatch_min(fop);
 
             return EC_STATE_PREPARE_ANSWER;

xlators/cluster/ec/src/ec-inode-write.c

@@ -710,29 +710,13 @@ ec_setxattr(call_frame_t *frame, xlator_t *this, uintptr_t target,
     ec_cbk_t callback = {.setxattr = func};
     ec_fop_data_t *fop = NULL;
     int32_t error = ENOMEM;
-    data_t *dict_data = NULL;
-    char *mask_key = "user.readmask";
-    int ret = 0;
-    int op_ret = -1;
 
     gf_msg_trace("ec", 0, "EC(SETXATTR) %p", frame);
 
     VALIDATE_OR_GOTO(this, out);
     GF_VALIDATE_OR_GOTO(this->name, frame, out);
     GF_VALIDATE_OR_GOTO(this->name, this->private, out);
 
-    ret = dict_lookup(dict, mask_key, &dict_data);
-    if(!ret && dict_data){
-        if(loc != NULL && loc->inode != NULL){
-            loc->inode->read_mask = data_to_uint16(dict_data);
-        }
-        dict_deln(dict, mask_key, strlen(mask_key));
-        dict_data = NULL;
-        error = 0;
-        op_ret = 0;
-        goto out;
-    }
-
     fop = ec_fop_data_allocate(frame, this, GF_FOP_SETXATTR, 0, target,
                                fop_flags, ec_wind_setxattr, ec_manager_xattr,
                                callback, data);
@@ -773,7 +757,7 @@ ec_setxattr(call_frame_t *frame, xlator_t *this, uintptr_t target,
 
     ec_t *ec = fop->xl->private;
     int64_t val = 0;
-    ret = dict_get_int64(fop->dict, SQUOTA_LIMIT_KEY, &val);
+    int ret = dict_get_int64(fop->dict, SQUOTA_LIMIT_KEY, &val);
     if (IS_SUCCESS(ret)) {
         /* divide the total usage to priv->fragments */
         int64_t new_value = val / ec->fragments;
@@ -791,7 +775,7 @@ ec_setxattr(call_frame_t *frame, xlator_t *this, uintptr_t target,
     if (fop != NULL) {
         ec_manager(fop, error);
     } else {
-        func(frame, NULL, this, op_ret, error, NULL);
+        func(frame, NULL, this, -1, error, NULL);
     }
 }