diff options
| author | Trond Myklebust | 2012-07-16 18:01:42 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-07-16 18:01:42 +0200 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /fs/nfs/proc.c | |
| parent | NFS: Create custom NFS v4 write_inode() function (diff) | |
| parent | VFS: Pass mount flags to sget() (diff) | |
| download | kernel-qcow2-linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.tar.gz kernel-qcow2-linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.tar.xz kernel-qcow2-linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.zip | |
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 cf6499742b10..c5ed1c0a8ab7 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) static int nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, - int flags, struct nfs_open_context *ctx) + int flags) { struct nfs_createdata *data; struct rpc_message msg = { |