diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /fs/nfs/proc.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'fs/nfs/proc.c')
| -rw-r--r-- | fs/nfs/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index cf6499742b1..c5ed1c0a8ab 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c | |||
| @@ -259,7 +259,7 @@ static void nfs_free_createdata(const struct nfs_createdata *data) | |||
| 259 | 259 | ||
| 260 | static int | 260 | static int |
| 261 | nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | 261 | nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, |
| 262 | int flags, struct nfs_open_context *ctx) | 262 | int flags) |
| 263 | { | 263 | { |
| 264 | struct nfs_createdata *data; | 264 | struct nfs_createdata *data; |
| 265 | struct rpc_message msg = { | 265 | struct rpc_message msg = { |