From c67b9219cfe132809555ad5a04c3e13c7cde70ed Mon Sep 17 00:00:00 2001 From: Bernd Schubert Date: Wed, 23 Mar 2022 19:49:17 +0100 Subject: [PATCH] passthrough_hp: Avoid a bit code dup in readdir Just a slight code simplification. --- example/passthrough_hp.cc | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/example/passthrough_hp.cc b/example/passthrough_hp.cc index 0167738..b367978 100644 --- a/example/passthrough_hp.cc +++ b/example/passthrough_hp.cc @@ -695,7 +695,7 @@ static bool is_dot_or_dotdot(const char *name) { static void do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, - off_t offset, fuse_file_info *fi, int plus) { + off_t offset, fuse_file_info *fi, const int plus) { auto d = get_dir_handle(fi); Inode& inode = get_inode(ino); lock_guard g {inode.m}; @@ -740,28 +740,23 @@ static void do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, fuse_entry_param e{}; size_t entsize; - if(plus) { + if (plus) { err = do_lookup(ino, entry->d_name, &e); if (err) goto error; entsize = fuse_add_direntry_plus(req, p, rem, entry->d_name, &e, entry->d_off); - - if (entsize > rem) { - if (fs.debug) - cerr << "DEBUG: readdir(): buffer full, returning data. " << endl; - forget_one(e.ino, 1); - break; - } } else { e.attr.st_ino = entry->d_ino; e.attr.st_mode = entry->d_type << 12; entsize = fuse_add_direntry(req, p, rem, entry->d_name, &e.attr, entry->d_off); + } - if (entsize > rem) { - if (fs.debug) - cerr << "DEBUG: readdir(): buffer full, returning data. " << endl; - break; - } + if (entsize > rem) { + if (fs.debug) + cerr << "DEBUG: readdir(): buffer full, returning data. " << endl; + if (plus) + forget_one(e.ino, 1); + break; } p += entsize; -- 2.30.2