mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
fuse: fix node ID type
Node ID is 64bit but it is passed as unsigned long to some functions. This breakage wasn't noticed, because libfuse uses unsigned long too. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e5d9a0df07
commit
b48badf013
@ -464,7 +464,7 @@ extern const struct file_operations fuse_dev_operations;
|
||||
/**
|
||||
* Get a filled in inode
|
||||
*/
|
||||
struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
|
||||
struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
|
||||
int generation, struct fuse_attr *attr,
|
||||
u64 attr_valid, u64 attr_version);
|
||||
|
||||
@ -472,7 +472,7 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
|
||||
* Send FORGET command
|
||||
*/
|
||||
void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req,
|
||||
unsigned long nodeid, u64 nlookup);
|
||||
u64 nodeid, u64 nlookup);
|
||||
|
||||
/**
|
||||
* Initialize READ or READDIR request
|
||||
|
@ -84,7 +84,7 @@ static void fuse_destroy_inode(struct inode *inode)
|
||||
}
|
||||
|
||||
void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req,
|
||||
unsigned long nodeid, u64 nlookup)
|
||||
u64 nodeid, u64 nlookup)
|
||||
{
|
||||
struct fuse_forget_in *inarg = &req->misc.forget_in;
|
||||
inarg->nlookup = nlookup;
|
||||
@ -207,7 +207,7 @@ static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr)
|
||||
|
||||
static int fuse_inode_eq(struct inode *inode, void *_nodeidp)
|
||||
{
|
||||
unsigned long nodeid = *(unsigned long *) _nodeidp;
|
||||
u64 nodeid = *(u64 *) _nodeidp;
|
||||
if (get_node_id(inode) == nodeid)
|
||||
return 1;
|
||||
else
|
||||
@ -216,12 +216,12 @@ static int fuse_inode_eq(struct inode *inode, void *_nodeidp)
|
||||
|
||||
static int fuse_inode_set(struct inode *inode, void *_nodeidp)
|
||||
{
|
||||
unsigned long nodeid = *(unsigned long *) _nodeidp;
|
||||
u64 nodeid = *(u64 *) _nodeidp;
|
||||
get_fuse_inode(inode)->nodeid = nodeid;
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
|
||||
struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
|
||||
int generation, struct fuse_attr *attr,
|
||||
u64 attr_valid, u64 attr_version)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user