summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2016-10-21 00:08:26 +0530
committerNiels de Vos <ndevos@redhat.com>2016-11-28 04:27:58 -0800
commit285987ab9ed968a37df1bada56f137579146a23f (patch)
treeebb7637a7570d8aada6ef0154757779f783b6c34
parent261f845ab8997c91ba51eb8b1ac94664989e38f0 (diff)
xlators/trash : Remove upper limit for trash max file size
Currently file which size exceeds more than 1GB never moved to trash directory. This is due to the hard coded check using GF_ALLOWED_MAX_FILE_SIZE. Upstream reference : >Change-Id: I2ed707bfe1c3114818896bb27a9856b9a164be92 >BUG: 1386766 >Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> >Reviewed-on: http://review.gluster.org/15689 >Smoke: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: Anoop C S <anoopcs@redhat.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: Vijay Bellur <vbellur@redhat.com> >(cherry picked from commit cd9be49f6fe05d424989c0686a7e55a3f3ead27e) Change-Id: I2ed707bfe1c3114818896bb27a9856b9a164be92 BUG: 1392366 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/15786 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Anoop C S <anoopcs@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--xlators/features/trash/src/trash.c16
-rw-r--r--xlators/features/trash/src/trash.h4
2 files changed, 2 insertions, 18 deletions
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
index 3a65d78..4a40083 100644
--- a/xlators/features/trash/src/trash.c
+++ b/xlators/features/trash/src/trash.c
@@ -2108,13 +2108,7 @@ reconfigure (xlator_t *this, dict_t *options)
GF_OPTION_RECONF ("trash-max-filesize", max_fsize, options,
size_uint64, out);
if (max_fsize) {
- if (max_fsize > GF_ALLOWED_MAX_FILE_SIZE) {
- gf_log (this->name, GF_LOG_DEBUG,
- "Size specified for max-size(in MB) is too "
- "large so using 1GB as max-size (NOT IDEAL)");
- priv->max_trash_file_size = GF_ALLOWED_MAX_FILE_SIZE;
- } else
- priv->max_trash_file_size = max_fsize;
+ priv->max_trash_file_size = max_fsize;
gf_log (this->name, GF_LOG_DEBUG, "%"GF_PRI_SIZET" max-size",
priv->max_trash_file_size);
}
@@ -2437,13 +2431,7 @@ init (xlator_t *this)
GF_DEFAULT_MAX_FILE_SIZE / GF_UNIT_MB);
priv->max_trash_file_size = GF_DEFAULT_MAX_FILE_SIZE;
} else {
- if( max_trash_file_size64 > GF_ALLOWED_MAX_FILE_SIZE ) {
- gf_log (this->name, GF_LOG_DEBUG,
- "Size specified for max-size(in MB) is too "
- "large so using 1GB as max-size (NOT IDEAL)");
- priv->max_trash_file_size = GF_ALLOWED_MAX_FILE_SIZE;
- } else
- priv->max_trash_file_size = max_trash_file_size64;
+ priv->max_trash_file_size = max_trash_file_size64;
gf_log (this->name, GF_LOG_DEBUG, "%"GF_PRI_SIZET" max-size",
priv->max_trash_file_size);
}
diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h
index cac7e5f..b34f52f 100644
--- a/xlators/features/trash/src/trash.h
+++ b/xlators/features/trash/src/trash.h
@@ -33,10 +33,6 @@
#define GF_DEFAULT_MAX_FILE_SIZE (200 * GF_UNIT_MB)
#endif
-#ifndef GF_ALLOWED_MAX_FILE_SIZE
-#define GF_ALLOWED_MAX_FILE_SIZE (1 * GF_UNIT_GB)
-#endif
-
struct trash_struct {
fd_t *fd; /* for the fd of existing file */
fd_t *newfd; /* for the newly created file */