From patchwork Wed Oct 2 20:16:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 2978731 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5A5509F245 for ; Wed, 2 Oct 2013 20:16:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34D7120204 for ; Wed, 2 Oct 2013 20:16:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 559A4201C8 for ; Wed, 2 Oct 2013 20:16:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851Ab3JBUQ3 (ORCPT ); Wed, 2 Oct 2013 16:16:29 -0400 Received: from fieldses.org ([174.143.236.118]:56713 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050Ab3JBUQ3 (ORCPT ); Wed, 2 Oct 2013 16:16:29 -0400 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1VRSqS-00059X-23; Wed, 02 Oct 2013 16:16:28 -0400 Date: Wed, 2 Oct 2013 16:16:27 -0400 From: "J. Bruce Fields" To: "J. Bruce Fields" Cc: Al Viro , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, jlayton@redhat.com, Dave Chinner Subject: Re: [PATCH 00/13] Implement NFSv4 delegations, take 12 Message-ID: <20131002201627.GI14808@fieldses.org> References: <1379623837-30798-1-git-send-email-bfields@redhat.com> <20131002135423.GA14808@fieldses.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20131002135423.GA14808@fieldses.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Oct 02, 2013 at 09:54:23AM -0400, bfields wrote: > On Thu, Sep 19, 2013 at 04:50:24PM -0400, J. Bruce Fields wrote: > > From: "J. Bruce Fields" > > > > Al, if you don't see any objections, could you queue this up for 3.13? > > Note: if it's more convenient, the identical patches are also available > from > > git://linux-nfs.org/~bfields/linux.git for-viro But kbuild points out I forgot to fix up some calls in ecryptfs. I'll push out another version with the below folded in, once I've checked whether there's anything else I touched that got turned off in my test .config.... --b. --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 7b19ebb..a842ced 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -208,7 +208,7 @@ ecryptfs_do_create(struct inode *directory_inode, inode = __ecryptfs_get_inode(lower_dentry->d_inode, directory_inode->i_sb); if (IS_ERR(inode)) { - vfs_unlink(lower_dir_dentry->d_inode, lower_dentry); + vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL); goto out_lock; } fsstack_copy_attr_times(directory_inode, lower_dir_dentry->d_inode); @@ -640,7 +640,8 @@ ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_lock; } rc = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry, - lower_new_dir_dentry->d_inode, lower_new_dentry); + lower_new_dir_dentry->d_inode, lower_new_dentry, + NULL); if (rc) goto out_lock; if (target_inode) @@ -891,7 +892,7 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length) struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry); mutex_lock(&lower_dentry->d_inode->i_mutex); - rc = notify_change(lower_dentry, &lower_ia); + rc = notify_change(lower_dentry, &lower_ia, NULL); mutex_unlock(&lower_dentry->d_inode->i_mutex); } return rc;