diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-27 12:24:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-27 12:24:08 -0700 |
| commit | cf481442f2e086316ed8a1b3046f00ad23632ac4 (patch) | |
| tree | 2edd0fb64549dfb6388e39d86e8965908dfcb925 /fs/9p/v9fs.h | |
| parent | 788d908f2879a17e5f80924f3da2e23f1034482d (diff) | |
| parent | 7815f4be4026b6c5027058102ae67a4b9feffa5f (diff) | |
| download | op-kernel-dev-cf481442f2e086316ed8a1b3046f00ad23632ac4.zip op-kernel-dev-cf481442f2e086316ed8a1b3046f00ad23632ac4.tar.gz | |
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: update documentation pointers
9p: remove unnecessary v9fses->options which duplicates the mount string
net/9p: insulate the client against an invalid error code sent by a 9p server
9p: Add missing cast for the error return value in v9fs_get_inode
9p: Remove redundant inode uid/gid assignment
9p: Fix possible regressions when ->get_sb fails.
9p: Fix v9fs show_options
9p: Fix possible memleak in v9fs_inode_from fid.
9p: minor comment fixes
9p: Fix possible inode leak in v9fs_get_inode.
9p: Check for error in return value of v9fs_fid_add
Diffstat (limited to 'fs/9p/v9fs.h')
| -rw-r--r-- | fs/9p/v9fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index a7d5671..38762bf 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h @@ -85,7 +85,6 @@ struct v9fs_session_info { unsigned int afid; unsigned int cache; - char *options; /* copy of mount options */ char *uname; /* user name to mount as */ char *aname; /* name of remote hierarchy being mounted */ unsigned int maxdata; /* max data for client interface */ |
