Skip to contentSkip to conversation

fsstack: Fix up eCryptfs compilation

PATCH New Josef Sipek 1 participant 1 message Oct 17, 2006 Ecrypt file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsstack: Fix up eCryptfs compilation

From: Josef "Jeff" Sipek <[email protected]>

The fsstack tidy patch broke eCryptfs. This patch makes eCryptfs compile again.

fs/ecryptfs/inode.c +3 -3
diff -r 2187c6b08f02 fs/ecryptfs/inode.c
@@ -621,9 +621,9 @@ ecryptfs_rename(struct inode *old_dir, s
 			lower_new_dir_dentry->d_inode, lower_new_dentry);
 	if (rc)
 		goto out_lock;
-	fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode);
+	fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode, NULL);
 	if (new_dir != old_dir)
-		fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
+		fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode, NULL);
 out_lock:
 	unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
 	dput(lower_new_dentry);
@@ -908,7 +908,7 @@ static int ecryptfs_setattr(struct dentr
 	}
 	rc = notify_change(lower_dentry, ia);
 out:
-	fsstack_copy_attr_all(inode, lower_inode);
+	fsstack_copy_attr_all(inode, lower_inode, NULL);
 	return rc;
 }
 
fs/ecryptfs/main.c +1 -1
diff -r 2187c6b08f02 fs/ecryptfs/main.c
@@ -116,7 +116,7 @@ int ecryptfs_interpose(struct dentry *lo
 		d_add(dentry, inode);
 	else
 		d_instantiate(dentry, inode);
-	fsstack_copy_attr_all(inode, lower_inode);
+	fsstack_copy_attr_all(inode, lower_inode, NULL);
 	/* This size will be overwritten for real files w/ headers and
 	 * other metadata */
 	fsstack_copy_inode_size(inode, lower_inode);