From: Miklos Szeredi [Jan Engelhardt] cosmetic fixes Signed-off-by: Miklos Szeredi Cc: Jan Engelhardt Signed-off-by: Andrew Morton --- fs/fuse/fuse_i.h | 2 +- fs/fuse/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/fuse/fuse_i.h~fuse-fix-permission-checking-on-sticky-directories-fix fs/fuse/fuse_i.h --- a/fs/fuse/fuse_i.h~fuse-fix-permission-checking-on-sticky-directories-fix +++ a/fs/fuse/fuse_i.h @@ -64,7 +64,7 @@ struct fuse_inode { /** Time in jiffies until the file attributes are valid */ u64 i_time; - /** The sticky bit in inode->i_mode may have been remved, so + /** The sticky bit in inode->i_mode may have been removed, so preserve the original mode */ mode_t orig_i_mode; }; diff -puN fs/fuse/inode.c~fuse-fix-permission-checking-on-sticky-directories-fix fs/fuse/inode.c --- a/fs/fuse/inode.c~fuse-fix-permission-checking-on-sticky-directories-fix +++ a/fs/fuse/inode.c @@ -124,7 +124,7 @@ void fuse_change_attributes(struct inode loff_t oldsize; inode->i_ino = attr->ino; - fi->orig_i_mode = (inode->i_mode & S_IFMT) + (attr->mode & 07777); + fi->orig_i_mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777); /* * Don't set the mode bits in i_mode, unless we want the VFS * to check permissions. This prevents failures due to the _