The patch titled
fuse-fix-permission-checking-on-sticky-directories fix
has been removed from the -mm tree. Its filename was
fuse-fix-permission-checking-on-sticky-directories-fix.patch
This patch was dropped because it was folded into fuse-fix-permission-checking-on-sticky-directories.patch
------------------------------------------------------
Subject: fuse-fix-permission-checking-on-sticky-directories fix
From: Miklos Szeredi <mszeredi@xxxxxxx>
[Jan Engelhardt] cosmetic fixes
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
Cc: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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
_
Patches currently in -mm which might be from mszeredi@xxxxxxx are
origin.patch
ext2-show-all-mount-options.patch
ext3-show-all-mount-options.patch
ext4-show-all-mount-options.patch
vfs-check-nanoseconds-in-utimensat.patch
fix-execute-checking-in-permission.patch
exec-remove-unnecessary-check-for-mnt_noexec.patch
clean-out-unused-code-in-dentry-pruning.patch
fuse-update-backing_dev_info-congestion-state.patch
fuse-fix-reserved-request-wake-up.patch
fuse-add-reference-counting-to-fuse_file.patch
fuse-truncate-on-spontaneous-size-change.patch
fuse-fix-page-invalidation.patch
fuse-set-i_nlink-to-sane-value-after-mount.patch
fuse-refresh-stale-attributes-in-fuse_permission.patch
fuse-fix-permission-checking-on-sticky-directories.patch
fuse-fix-permission-checking-on-sticky-directories-fix.patch
fuse-fix-permission-checking-on-sticky-directories-fix-setting-i_mode-bits.patch
fuse-cleanup-in-release.patch
fuse-no-abort-on-interrupt.patch
fuse-no-enoent-from-fuse-device-read.patch
fuse-clean-up-execute-permission-checking.patch
r-o-bind-mounts-sys_mknodat-elevate-write-count-for-vfs_mknod-create-fix.patch
slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-revoke.patch
fs-introduce-write_begin-write_end-and-perform_write-aops-revoke-fix.patch
fuse-fix-allowing-operations.patch
fuse-fix-race-between-getattr-and-write.patch
fuse-fix-race-between-getattr-and-write-checkpatch-fixes.patch
fuse-add-file-handle-to-getattr-operation.patch
fuse-add-file-handle-to-getattr-operation-checkpatch-fixes.patch
fuse-clean-up-open-file-passing-in-setattr.patch
vfs-allow-filesystems-to-implement-atomic-opentruncate.patch
fuse-improve-utimes-support.patch
fuse-add-atomic-opentruncate-support.patch
fuse-support-bsd-locking-semantics.patch
fuse-add-list-of-writable-files-to-fuse_inode.patch
fuse-add-helper-for-asynchronous-writes.patch
fuse-add-support-for-mandatory-locking.patch
fuse-add-blksize-field-to-fuse_attr.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
