diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 12:23:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 12:23:21 -0800 |
| commit | 1836d95928a0f41ada0cbb2a6c4e46b027db9491 (patch) | |
| tree | 24ebf7cfd598dfef82247044fb3b65110fe22fc8 /include | |
| parent | 333a07437c31ea8c16a2b82071629a540ae1e50f (diff) | |
| parent | 3e2796a90cf349527e50b3bc4d0b2f4019b1ce7a (diff) | |
| download | linux-3.10-1836d95928a0f41ada0cbb2a6c4e46b027db9491.tar.gz linux-3.10-1836d95928a0f41ada0cbb2a6c4e46b027db9491.tar.bz2 linux-3.10-1836d95928a0f41ada0cbb2a6c4e46b027db9491.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix readdir corner cases
9p: fix readlink
9p: fix a small bug in readdir for long directories
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/9p/client.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index e26812274b7..fb00b329f0d 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -159,8 +159,7 @@ struct p9_client { * @qid: the &p9_qid server identifier this handle points to * @iounit: the server reported maximum transaction size for this file * @uid: the numeric uid of the local user who owns this handle - * @aux: transport specific information (unused?) - * @rdir_fpos: tracks offset of file position when reading directory contents + * @rdir: readdir accounting structure (allocated on demand) * @flist: per-client-instance fid tracking * @dlist: per-dentry fid tracking * @@ -174,9 +173,9 @@ struct p9_fid { struct p9_qid qid; u32 iounit; uid_t uid; - void *aux; - int rdir_fpos; + void *rdir; + struct list_head flist; struct list_head dlist; /* list of all fids attached to a dentry */ }; |