The patch titled reiser4: remove inode_setattr has been removed from the -mm tree. Its filename was reiser4-remove-inode_setattr.patch This patch was dropped because it was folded into reiser4.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: reiser4: remove inode_setattr From: Edward Shishkin <edward.shishkin@xxxxxxxxx> Adjust reiser4 to vfs changes: inode_setattr() has been removed. Signed-off-by: Edward Shishkin <edward.shishkin@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiser4/plugin/inode_ops.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff -puN fs/reiser4/plugin/inode_ops.c~reiser4-remove-inode_setattr fs/reiser4/plugin/inode_ops.c --- a/fs/reiser4/plugin/inode_ops.c~reiser4-remove-inode_setattr +++ a/fs/reiser4/plugin/inode_ops.c @@ -446,7 +446,9 @@ int reiser4_setattr_common(struct dentry assert("nikita-3119", !(attr->ia_valid & ATTR_SIZE)); /* - * grab disk space and call standard inode_setattr(). + * grab disk space and call standard + * setattr_copy(); + * mark_inode_dirty(). */ result = setattr_reserve(reiser4_tree_by_inode(inode)); if (!result) { @@ -460,9 +462,9 @@ int reiser4_setattr_common(struct dentry return result; } } - result = inode_setattr(inode, attr); - if (!result) - reiser4_update_sd(inode); + setattr_copy(inode, attr); + mark_inode_dirty(inode); + result = reiser4_update_sd(inode); } context_set_commit_async(ctx); _ Patches currently in -mm which might be from edward.shishkin@xxxxxxxxx are linux-next.patch reiserfs-make-sure-va_end-is-always-called-after-va_start.patch vfs-add-super-operation-writeback_inodes.patch vfs-add-super-operation-writeback_inodes-fix.patch vfs-take-2add-set_page_dirty_notag.patch vfs-change-writeback_inodes-signature.patch reiser4.patch reiser4-change-fsync-signature.patch reiser4-writeback_inodes-implementation.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-writeback_inodes-implementation-adjust-to-writeback-changes.patch reiser4-fixup-checkin-checkout-jnodes-for-entd.patch reiser4-fixups.patch reiser4-broke.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