linux-next: creds tree build failure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi David,

Today's linux-next build (powerpc_ppc64_defconfig) failed like this:

fs/autofs4/dev-ioctl.c: In function 'autofs_dev_ioctl_open_mountpoint':
fs/autofs4/dev-ioctl.c:310: error: too few arguments to function 'dentry_open'

Commit 8d7b48e0bc5fa01a818eac713d4cb0763090cd0e ("autofs4: add
miscellaneous device for ioctls") added this file and interacts with
commit 327a669334991cb9d42e7eddf771fd760721fbf8 ("CRED: Pass credentials
through dentry_open()") from the creds tree.

I applied the following patch (which may not be correct).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 17 Oct 2008 17:23:07 +1100
Subject: [PATCH] creds: autofs4 needs updating for dentry_open change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 fs/autofs4/dev-ioctl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 625abf5..3c299be 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -288,6 +288,7 @@ static int autofs_dev_ioctl_open_mountpoint(const char *path, dev_t devid)
 	struct file *filp;
 	struct nameidata nd;
 	int err, fd;
+	const struct cred *cred = current_cred();
 
 	fd = get_unused_fd();
 	if (likely(fd >= 0)) {
@@ -307,7 +308,8 @@ static int autofs_dev_ioctl_open_mountpoint(const char *path, dev_t devid)
 			goto out;
 		}
 
-		filp = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY);
+		filp = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY,
+			cred);
 		if (IS_ERR(filp)) {
 			err = PTR_ERR(filp);
 			goto out;
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux