Backport from ml:
commit 7d2e0a099c7685a7355c27a2c3dc76ea7cfc8283
Author: Miklos Szeredi <[email protected]>
Date: Wed Jul 1 16:26:00 2015 +0200
fuse: simplify unique ctr
Since it's a 64bit counter, it's never gonna wrap around. Remove code
dealing with that possibility.
Signed-off-by: Miklos Szeredi <[email protected]>
Reviewed-by: Ashish Samant <[email protected]>
Signed-off-by: Maxim Patlasov <[email protected]>
---
fs/fuse/dev.c | 7 +------
fs/fuse/inode.c | 1 -
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 0091d12..22e2547 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -302,12 +302,7 @@ static unsigned len_args(unsigned numargs, struct fuse_arg
*args)
static u64 fuse_get_unique(struct fuse_conn *fc)
{
- fc->reqctr++;
- /* zero is special */
- if (fc->reqctr == 0)
- fc->reqctr = 1;
-
- return fc->reqctr;
+ return ++fc->reqctr;
}
static void queue_request(struct fuse_conn *fc, struct fuse_req *req)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index fbd6d38..bf7f411 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -725,7 +725,6 @@ void fuse_conn_init(struct fuse_conn *fc)
fc->congestion_threshold = FUSE_DEFAULT_CONGESTION_THRESHOLD;
fc->khctr = 0;
fc->polled_files = RB_ROOT;
- fc->reqctr = 0;
fc->blocked = 0;
fc->initialized = 0;
fc->attr_version = 1;
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
