All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: "J. Bruce Fields" <bfields@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	jlayton@redhat.com, Dave Chinner <david@fromorbit.com>
Subject: Re: [PATCH 00/13] Implement NFSv4 delegations, take 12
Date: Wed, 2 Oct 2013 16:16:27 -0400	[thread overview]
Message-ID: <20131002201627.GI14808@fieldses.org> (raw)
In-Reply-To: <20131002135423.GA14808@fieldses.org>

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" <bfields@redhat.com>
> > 
> > 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.

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;

WARNING: multiple messages have this Message-ID (diff)
From: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
To: "J. Bruce Fields" <bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>,
	linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	Dave Chinner <david-FqsqvQoI3Ljby3iVrkZq2A@public.gmane.org>
Subject: Re: [PATCH 00/13] Implement NFSv4 delegations, take 12
Date: Wed, 2 Oct 2013 16:16:27 -0400	[thread overview]
Message-ID: <20131002201627.GI14808@fieldses.org> (raw)
In-Reply-To: <20131002135423.GA14808-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>

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" <bfields-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > 
> > 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.

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;
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2013-10-02 20:16 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-19 20:50 [PATCH 00/13] Implement NFSv4 delegations, take 12 J. Bruce Fields
2013-09-19 20:50 ` J. Bruce Fields
2013-09-19 20:50 ` [PATCH 01/13] vfs: pull ext4's double-i_mutex-locking into common code J. Bruce Fields
2013-09-19 20:50 ` [PATCH 02/13] vfs: don't use PARENT/CHILD lock classes for non-directories J. Bruce Fields
2013-09-19 20:50 ` [PATCH 03/13] vfs: rename I_MUTEX_QUOTA now that it's not used for quotas J. Bruce Fields
2013-09-19 20:50 ` [PATCH 04/13] vfs: take i_mutex on renamed file J. Bruce Fields
2013-09-19 20:50 ` [PATCH 05/13] locks: introduce new FL_DELEG lock flag J. Bruce Fields
2013-09-19 20:50   ` J. Bruce Fields
2013-09-19 20:50 ` [PATCH 06/13] locks: implement delegations J. Bruce Fields
2013-09-19 20:50   ` J. Bruce Fields
2013-09-19 20:50 ` [PATCH 07/13] namei: minor vfs_unlink cleanup J. Bruce Fields
2013-09-19 20:50 ` [PATCH 08/13] locks: break delegations on unlink J. Bruce Fields
2013-09-19 20:50   ` J. Bruce Fields
2013-09-19 20:50 ` [PATCH 09/13] locks: helper functions for delegation breaking J. Bruce Fields
2013-09-19 20:50 ` [PATCH 10/13] locks: break delegations on rename J. Bruce Fields
2013-09-19 20:50 ` [PATCH 11/13] locks: break delegations on link J. Bruce Fields
2013-09-19 20:50 ` [PATCH 12/13] locks: break delegations on any attribute modification J. Bruce Fields
2013-09-19 20:50   ` J. Bruce Fields
2013-09-19 20:50 ` [PATCH 13/13] locks: close potential race between setlease and open J. Bruce Fields
2013-10-02 13:54 ` [PATCH 00/13] Implement NFSv4 delegations, take 12 J. Bruce Fields
2013-10-02 13:54   ` J. Bruce Fields
2013-10-02 20:16   ` J. Bruce Fields [this message]
2013-10-02 20:16     ` J. Bruce Fields
2013-10-03 19:41     ` J. Bruce Fields
2013-10-07 15:20       ` J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131002201627.GI14808@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=bfields@redhat.com \
    --cc=david@fromorbit.com \
    --cc=jlayton@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.