Skip to content

Commit

Permalink
virtiofsd: Extend size of fuse_conn_info->capable and ->want fields
Browse files Browse the repository at this point in the history
->capable keeps track of what capabilities kernel supports and ->wants keep
track of what capabilities filesytem wants.

Right now these fields are 32bit in size. But now fuse has run out of
bits and capabilities can now have bit number which are higher than 31.

That means 32 bit fields are not suffcient anymore. Increase size to 64
bit so that we can add newer capabilities and still be able to use existing
code to check and set the capabilities.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Message-Id: <20220208204813.682906-5-vgoyal@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  • Loading branch information
rhvgoyal authored and dagrh committed Feb 17, 2022
1 parent 776dc4b commit 4c7c393
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tools/virtiofsd/fuse_common.h
Expand Up @@ -439,15 +439,15 @@ struct fuse_conn_info {
/**
* Capability flags that the kernel supports (read-only)
*/
unsigned capable;
uint64_t capable;

/**
* Capability flags that the filesystem wants to enable.
*
* libfuse attempts to initialize this field with
* reasonable default values before calling the init() handler.
*/
unsigned want;
uint64_t want;

/**
* Maximum number of pending "background" requests. A
Expand Down
2 changes: 1 addition & 1 deletion tools/virtiofsd/fuse_lowlevel.c
Expand Up @@ -2070,7 +2070,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
if (se->conn.want & (~se->conn.capable)) {
fuse_log(FUSE_LOG_ERR,
"fuse: error: filesystem requested capabilities "
"0x%x that are not supported by kernel, aborting.\n",
"0x%llx that are not supported by kernel, aborting.\n",
se->conn.want & (~se->conn.capable));
fuse_reply_err(req, EPROTO);
se->error = -EPROTO;
Expand Down

0 comments on commit 4c7c393

Please sign in to comment.