This patch changes the interface of the ->readdir() nfs_rpc_op
so that its first argument is a dentry instead of an inode.
[Explanation: The dentry is required because in NFSv4, we need
to make use of the _parent_ directory's inode. This is because
NFSv4 servers no longer return an entry for ".." in the READDIR
response, so the client kernel needs to fake this entry, inode
number and all.]
--- old/include/linux/nfs_xdr.h Wed Jul 24 16:03:23 2002
+++ new/include/linux/nfs_xdr.h Mon Jul 29 13:50:30 2002
@@ -327,7 +327,7 @@ struct nfs_rpc_ops {
int (*mkdir) (struct inode *, struct qstr *, struct iattr *,
struct nfs_fh *, struct nfs_fattr *);
int (*rmdir) (struct inode *, struct qstr *);
- int (*readdir) (struct inode *, struct rpc_cred *,
+ int (*readdir) (struct dentry *, struct rpc_cred *,
u64, struct page *, unsigned int, int);
int (*mknod) (struct inode *, struct qstr *, struct iattr *,
dev_t, struct nfs_fh *, struct nfs_fattr *);
--- old/fs/nfs/dir.c Wed Jul 24 16:03:27 2002
+++ new/fs/nfs/dir.c Mon Jul 29 11:50:09 2002
@@ -105,7 +105,7 @@ int nfs_readdir_filler(nfs_readdir_descr
dfprintk(VFS, "NFS: nfs_readdir_filler() reading cookie %Lu into page %lu.\n", (long long)desc->entry->cookie, page->index);
again:
- error = NFS_PROTO(inode)->readdir(inode, cred, desc->entry->cookie, page,
+ error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, desc->entry->cookie, page,
NFS_SERVER(inode)->dtsize, desc->plus);
/* We requested READDIRPLUS, but the server doesn't grok it */
if (desc->plus && error == -ENOTSUPP) {
@@ -314,7 +314,7 @@ int uncached_readdir(nfs_readdir_descrip
status = -ENOMEM;
goto out;
}
- desc->error = NFS_PROTO(inode)->readdir(inode, cred, desc->target,
+ desc->error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, desc->target,
page,
NFS_SERVER(inode)->dtsize,
desc->plus);
--- old/fs/nfs/proc.c Wed Jul 24 16:03:25 2002
+++ new/fs/nfs/proc.c Mon Jul 29 14:11:48 2002
@@ -425,9 +427,10 @@ nfs_proc_rmdir(struct inode *dir, struct
* from nfs_readdir by calling the decode_entry function directly.
*/
static int
-nfs_proc_readdir(struct inode *dir, struct rpc_cred *cred,
+nfs_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
u64 cookie, struct page *page, unsigned int count, int plus)
{
+ struct inode *dir = dentry->d_inode;
struct nfs_readdirargs arg = {
fh: NFS_FH(dir),
cookie: cookie,
--- old/fs/nfs/nfs3proc.c Wed Jul 24 16:03:27 2002
+++ new/fs/nfs/nfs3proc.c Mon Jul 29 14:11:56 2002
@@ -538,9 +541,10 @@ nfs3_proc_rmdir(struct inode *dir, struc
* readdirplus.
*/
static int
-nfs3_proc_readdir(struct inode *dir, struct rpc_cred *cred,
+nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
u64 cookie, struct page *page, unsigned int count, int plus)
{
+ struct inode *dir = dentry->d_inode;
struct nfs_fattr dir_attr;
u32 *verf = NFS_COOKIEVERF(dir);
struct nfs3_readdirargs arg = {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 15 2002 - 22:00:34 EST