From a264e65b62ef61c3c9c64429ddee834a5ad19687 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jul 2011 03:17:33 -0400 Subject: [PATCH] --- yaml --- r: 280253 b: refs/heads/master c: 541af6a07474352e2143a0527c2b62b732439815 h: refs/heads/master i: 280251: 66daba7dbbcf4ef76f62f46ac1f8700f06782756 v: v3 --- [refs] | 2 +- trunk/fs/fuse/dir.c | 6 +++--- trunk/fs/fuse/fuse_i.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 91b573c45d4c..fa89b9c8dd96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 632861f05a8e5878a267d173000880ceb608b56e +refs/heads/master: 541af6a07474352e2143a0527c2b62b732439815 diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c index b4c09c5ed8dc..5ddd6ea8f839 100644 --- a/trunk/fs/fuse/dir.c +++ b/trunk/fs/fuse/dir.c @@ -369,8 +369,8 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, * If the filesystem doesn't support this, then fall back to separate * 'mknod' + 'open' requests. */ -static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, - struct nameidata *nd) +static int fuse_create_open(struct inode *dir, struct dentry *entry, + umode_t mode, struct nameidata *nd) { int err; struct inode *inode; @@ -480,7 +480,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, */ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req, struct inode *dir, struct dentry *entry, - int mode) + umode_t mode) { struct fuse_entry_out outarg; struct inode *inode; diff --git a/trunk/fs/fuse/fuse_i.h b/trunk/fs/fuse/fuse_i.h index cf6db0a93219..1964da0257d9 100644 --- a/trunk/fs/fuse/fuse_i.h +++ b/trunk/fs/fuse/fuse_i.h @@ -80,7 +80,7 @@ struct fuse_inode { /** The sticky bit in inode->i_mode may have been removed, so preserve the original mode */ - mode_t orig_i_mode; + umode_t orig_i_mode; /** Version of last attribute change */ u64 attr_version;