ecryptfs: fix broken build (6254b32b) · Commits · 戴 / test

Stephen Rothwell reports that the vfs merge broke the build of ecryptfs. The breakage comes from commit ("sanitize ecryptfs ->mount()") which was obviously not even build tested. Tssk, tssk, Al. This is the minimal build fixup for the situation, although I don't have a filesystem to actually test it with. Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/ecryptfs/main.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -141,13 +141,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
		return rc;
		}

		static inode ecryptfs_get_inode(struct inode lower_inode,
		static struct inode ecryptfs_get_inode(struct inode lower_inode,
		struct super_block *sb)
		{
		struct inode *inode;
		int rc = 0;

		lower_inode = lower_dentry->d_inode;
		if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb)) {
		rc = -EXDEV;
		goto out;
		@@ -202,7 +201,7 @@ int ecryptfs_interpose(struct dentry lower_dentry, struct dentry dentry,
		{
		struct inode *lower_inode = lower_dentry->d_inode;
		struct inode *inode = ecryptfs_get_inode(lower_inode, sb);
		if (IS_ERR(inode)
		if (IS_ERR(inode))
		return PTR_ERR(inode);
		if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD)
		d_add(dentry, inode);

Admin message