summaryrefslogtreecommitdiffstats
path: root/xlators/performance/readdir-ahead/src/readdir-ahead.h
diff options
context:
space:
mode:
authorRaghavendra G <rgowdapp@redhat.com>2018-08-03 19:06:27 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2018-08-03 22:18:11 +0000
commit60fbef9a0b6057e87f3a4fbdcb3270bd65b649c1 (patch)
tree74a29840dec40402d5203fdcab4cd105ba84d5dd /xlators/performance/readdir-ahead/src/readdir-ahead.h
parent7959147cfa75b3dd0320090e2173bb90930788e7 (diff)
Revert "performance/readdir-ahead: Invalidate cached dentries if they're modified while in cache"
This reverts commit 7131de81f72dda0ef685ed60d0887c6e14289b8c. With the latest master, I created a single brick volume and some files inside it. [root@rhgs313-6 ~]# umount -f /mnt/fuse1; mount -t glusterfs -s 192.168.122.6:/thunder /mnt/fuse1; ls -l /mnt/fuse1/; echo "Trying again"; ls -l /mnt/fuse1 umount: /mnt/fuse1: not mounted total 0 ----------. 0 root root 0 Jan 1 1970 file-1 ----------. 0 root root 0 Jan 1 1970 file-2 ----------. 0 root root 0 Jan 1 1970 file-3 ----------. 0 root root 0 Jan 1 1970 file-4 ----------. 0 root root 0 Jan 1 1970 file-5 d---------. 0 root root 0 Jan 1 1970 subdir Trying again total 3 -rw-r--r--. 1 root root 33 Aug 3 14:06 file-1 -rw-r--r--. 1 root root 33 Aug 3 14:06 file-2 -rw-r--r--. 1 root root 33 Aug 3 14:06 file-3 -rw-r--r--. 1 root root 33 Aug 3 14:06 file-4 -rw-r--r--. 1 root root 33 Aug 3 14:06 file-5 d---------. 0 root root 0 Jan 1 1970 subdir [root@rhgs313-6 ~]# Conversation can be followed on gluster-devel on thread with subj: tests/bugs/distribute/bug-1122443.t - spurious failure. git-bisected pointed this patch as culprit. Change-Id: I1eb46f6c196f44fde8ce991840a0e724e6f50862 Signed-off-by: Raghavendra G <rgowdapp@redhat.com> Updates: bz#1390050
Diffstat (limited to 'xlators/performance/readdir-ahead/src/readdir-ahead.h')
-rw-r--r--xlators/performance/readdir-ahead/src/readdir-ahead.h39
1 files changed, 1 insertions, 38 deletions
diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.h b/xlators/performance/readdir-ahead/src/readdir-ahead.h
index 7ffb92a9be8..3c06cc0f107 100644
--- a/xlators/performance/readdir-ahead/src/readdir-ahead.h
+++ b/xlators/performance/readdir-ahead/src/readdir-ahead.h
@@ -19,37 +19,6 @@
#define RDA_FD_BYPASS (1 << 4)
#define RDA_FD_PLUGGED (1 << 5)
-
-#define RDA_COMMON_MODIFICATION_FOP(name, frame, this, __inode, __xdata, args ...)\
- do { \
- struct rda_local *__local = NULL; \
- \
- __local = mem_get0 (this->local_pool); \
- __local->inode = inode_ref (__inode); \
- \
- frame->local = __local; \
- if (__xdata) \
- __local->xattrs = dict_ref (__xdata); \
- \
- STACK_WIND (frame, rda_##name##_cbk, FIRST_CHILD(this), \
- FIRST_CHILD(this)->fops->name, args, __xdata); \
- } while (0)
-
-
-#define RDA_STACK_UNWIND(fop, frame, params ...) do { \
- struct rda_local *__local = NULL; \
- if (frame) { \
- __local = frame->local; \
- frame->local = NULL; \
- } \
- STACK_UNWIND_STRICT (fop, frame, params); \
- if (__local) { \
- rda_local_wipe (__local); \
- mem_put (__local); \
- } \
-} while (0)
-
-
struct rda_fd_ctx {
off_t cur_offset; /* current head of the ctx */
size_t cur_size; /* current size of the preload */
@@ -67,9 +36,7 @@ struct rda_local {
struct rda_fd_ctx *ctx;
fd_t *fd;
off_t offset;
- dict_t *xattrs; /* md-cache keys to be sent in readdirp() */
- int32_t skip_dir;
- inode_t *inode;
+ dict_t *xattrs; /* xattrs to be sent in readdirp() */
};
struct rda_priv {
@@ -81,8 +48,4 @@ struct rda_priv {
gf_boolean_t parallel_readdir;
};
-typedef struct rda_inode_ctx {
- struct iatt statbuf;
-} rda_inode_ctx_t;
-
#endif /* __READDIR_AHEAD_H */