From 3311ce2f4cabfdfbaf3e91b891f39be3c0825d02 Mon Sep 17 00:00:00 2001 From: Martin Waitz Date: Wed, 1 Feb 2006 03:06:57 -0800 Subject: [PATCH] --- yaml --- r: 19467 b: refs/heads/master c: 7045f37b17ffa6e85435ca980122b46a74caa7e4 h: refs/heads/master i: 19465: a09365fea74a2bb276308d43273918a6ec23fb9e 19463: 924f31e28249e3e25c75edbdbc1795b57c1ac309 v: v3 --- [refs] | 2 +- trunk/fs/inode.c | 2 +- trunk/fs/namei.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb49d28f3537..6f152e829599 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99acf0442111cc452ac1b93868dde8f6ff37a989 +refs/heads/master: 7045f37b17ffa6e85435ca980122b46a74caa7e4 diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c index 108138d4e909..d0be6159eb7f 100644 --- a/trunk/fs/inode.c +++ b/trunk/fs/inode.c @@ -1179,7 +1179,7 @@ EXPORT_SYMBOL(bmap); /** * touch_atime - update the access time * @mnt: mount the inode is accessed on - * @inode: inode accessed + * @dentry: dentry accessed * * Update the accessed time on an inode and mark it for writeback. * This function automatically handles read only file systems and media, diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 4acdac043b6b..7ac9fb4acb2c 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1161,6 +1161,7 @@ static int __path_lookup_intent_open(int dfd, const char *name, /** * path_lookup_open - lookup a file path with open intent + * @dfd: the directory to use as base, or AT_FDCWD * @name: pointer to file name * @lookup_flags: lookup intent flags * @nd: pointer to nameidata @@ -1175,6 +1176,7 @@ int path_lookup_open(int dfd, const char *name, unsigned int lookup_flags, /** * path_lookup_create - lookup a file path with open + create intent + * @dfd: the directory to use as base, or AT_FDCWD * @name: pointer to file name * @lookup_flags: lookup intent flags * @nd: pointer to nameidata