[1/3] ecryptfs: remove unused helpers

Commit Message

Christian Brauner April 9, 2021, 4:24 p.m. UTC

From: Christian Brauner <[e-mail]>

Remove two helpers that are unused.

Cc: Amir Goldstein <[e-mail]>
Cc: Tyler Hicks <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Signed-off-by: Christian Brauner <[e-mail]>
---
 fs/ecryptfs/ecryptfs_kernel.h | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Tyler Hicks April 19, 2021, 4:48 a.m. UTC | #1

On 2021-04-09 18:24:20, Christian Brauner wrote:
> From: Christian Brauner <[e-mail]>
> 
> Remove two helpers that are unused.
> 
> Cc: Amir Goldstein <[e-mail]>
> Cc: Tyler Hicks <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Signed-off-by: Christian Brauner <[e-mail]>

I'll pick this patch up now as it looks like it didn't make it into your
v2 of the port to private mounts. I'll review those patches separately.

Thanks!

Tyler

> ---
>  fs/ecryptfs/ecryptfs_kernel.h | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
> index e6ac78c62ca4..463b2d99b554 100644
> --- a/fs/ecryptfs/ecryptfs_kernel.h
> +++ b/fs/ecryptfs/ecryptfs_kernel.h
> @@ -496,12 +496,6 @@ ecryptfs_set_superblock_lower(struct super_block *sb,
>  	((struct ecryptfs_sb_info *)sb->s_fs_info)->wsi_sb = lower_sb;
>  }
>  
> -static inline struct ecryptfs_dentry_info *
> -ecryptfs_dentry_to_private(struct dentry *dentry)
> -{
> -	return (struct ecryptfs_dentry_info *)dentry->d_fsdata;
> -}
> -
>  static inline void
>  ecryptfs_set_dentry_private(struct dentry *dentry,
>  			    struct ecryptfs_dentry_info *dentry_info)
> @@ -515,12 +509,6 @@ ecryptfs_dentry_to_lower(struct dentry *dentry)
>  	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry;
>  }
>  
> -static inline struct vfsmount *
> -ecryptfs_dentry_to_lower_mnt(struct dentry *dentry)
> -{
> -	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt;
> -}
> -
>  static inline struct path *
>  ecryptfs_dentry_to_lower_path(struct dentry *dentry)
>  {
> -- 
> 2.27.0
>

Al Viro April 19, 2021, 1:49 p.m. UTC | #2

On Sun, Apr 18, 2021 at 11:48:50PM -0500, Tyler Hicks wrote:
> On 2021-04-09 18:24:20, Christian Brauner wrote:
> > From: Christian Brauner <[e-mail]>
> > 
> > Remove two helpers that are unused.
> > 
> > Cc: Amir Goldstein <[e-mail]>
> > Cc: Tyler Hicks <[e-mail]>
> > Cc: [e-mail]
> > Cc: [e-mail]
> > Signed-off-by: Christian Brauner <[e-mail]>
> 
> I'll pick this patch up now as it looks like it didn't make it into your
> v2 of the port to private mounts. I'll review those patches separately.

FWIW, there's also a series in vfs.git #work.ecryptfs (posted Mar 20),
and that, AFAICS, duplicates 483bc7e82ccfc in there...

Tyler Hicks April 19, 2021, 2:22 p.m. UTC | #3

On 2021-04-19 13:49:08, Al Viro wrote:
> On Sun, Apr 18, 2021 at 11:48:50PM -0500, Tyler Hicks wrote:
> > On 2021-04-09 18:24:20, Christian Brauner wrote:
> > > From: Christian Brauner <[e-mail]>
> > > 
> > > Remove two helpers that are unused.
> > > 
> > > Cc: Amir Goldstein <[e-mail]>
> > > Cc: Tyler Hicks <[e-mail]>
> > > Cc: [e-mail]
> > > Cc: [e-mail]
> > > Signed-off-by: Christian Brauner <[e-mail]>
> > 
> > I'll pick this patch up now as it looks like it didn't make it into your
> > v2 of the port to private mounts. I'll review those patches separately.
> 
> FWIW, there's also a series in vfs.git #work.ecryptfs (posted Mar 20),
> and that, AFAICS, duplicates 483bc7e82ccfc in there...

Yeah, I noticed that after I pushed Christian's commit to my next
branch. I've fallen behind on eCryptfs patch review. :/

I plan to review vfs.git #work.ecryptfs in the next couple days. If
everything looks good, do you want me to take it via my tree or were you
planning on taking those yourself?

Tyler

Christian Brauner April 19, 2021, 2:37 p.m. UTC | #4

On Mon, Apr 19, 2021 at 01:49:08PM +0000, Al Viro wrote:
> On Sun, Apr 18, 2021 at 11:48:50PM -0500, Tyler Hicks wrote:
> > On 2021-04-09 18:24:20, Christian Brauner wrote:
> > > From: Christian Brauner <[e-mail]>
> > > 
> > > Remove two helpers that are unused.
> > > 
> > > Cc: Amir Goldstein <[e-mail]>
> > > Cc: Tyler Hicks <[e-mail]>
> > > Cc: [e-mail]
> > > Cc: [e-mail]
> > > Signed-off-by: Christian Brauner <[e-mail]>
> > 
> > I'll pick this patch up now as it looks like it didn't make it into your
> > v2 of the port to private mounts. I'll review those patches separately.
> 
> FWIW, there's also a series in vfs.git #work.ecryptfs (posted Mar 20),
> and that, AFAICS, duplicates 483bc7e82ccfc in there...

Yeah, this is why I dropped the patch in the combined series I sent out
last week.

Al Viro April 19, 2021, 3:27 p.m. UTC | #5

On Mon, Apr 19, 2021 at 09:22:58AM -0500, Tyler Hicks wrote:
> On 2021-04-19 13:49:08, Al Viro wrote:
> > On Sun, Apr 18, 2021 at 11:48:50PM -0500, Tyler Hicks wrote:
> > > On 2021-04-09 18:24:20, Christian Brauner wrote:
> > > > From: Christian Brauner <[e-mail]>
> > > > 
> > > > Remove two helpers that are unused.
> > > > 
> > > > Cc: Amir Goldstein <[e-mail]>
> > > > Cc: Tyler Hicks <[e-mail]>
> > > > Cc: [e-mail]
> > > > Cc: [e-mail]
> > > > Signed-off-by: Christian Brauner <[e-mail]>
> > > 
> > > I'll pick this patch up now as it looks like it didn't make it into your
> > > v2 of the port to private mounts. I'll review those patches separately.
> > 
> > FWIW, there's also a series in vfs.git #work.ecryptfs (posted Mar 20),
> > and that, AFAICS, duplicates 483bc7e82ccfc in there...
> 
> Yeah, I noticed that after I pushed Christian's commit to my next
> branch. I've fallen behind on eCryptfs patch review. :/
> 
> I plan to review vfs.git #work.ecryptfs in the next couple days. If
> everything looks good, do you want me to take it via my tree or were you
> planning on taking those yourself?

Entirely up to you.  The only patch in there that might have some interplay
with VFS work is lock_parent() changes (#2/4) and the stuff it might be
a prereq for is not going to get ready until the next cycle - you are not
the only one with clogged queue ;-/

So even if you prefer to cherry-pick those one by one, I've no problem with
that; just tell me when to drop that branch and I'll do so.

Patch

diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index e6ac78c62ca4..463b2d99b554 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -496,12 +496,6 @@  ecryptfs_set_superblock_lower(struct super_block *sb,
 	((struct ecryptfs_sb_info *)sb->s_fs_info)->wsi_sb = lower_sb;
 }
 
-static inline struct ecryptfs_dentry_info *
-ecryptfs_dentry_to_private(struct dentry *dentry)
-{
-	return (struct ecryptfs_dentry_info *)dentry->d_fsdata;
-}
-
 static inline void
 ecryptfs_set_dentry_private(struct dentry *dentry,
 			    struct ecryptfs_dentry_info *dentry_info)
@@ -515,12 +509,6 @@  ecryptfs_dentry_to_lower(struct dentry *dentry)
 	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry;
 }
 
-static inline struct vfsmount *
-ecryptfs_dentry_to_lower_mnt(struct dentry *dentry)
-{
-	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt;
-}
-
 static inline struct path *
 ecryptfs_dentry_to_lower_path(struct dentry *dentry)
 {