xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Browse Source 
Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c
This commit is contained in:
Trond Myklebust
2012-07-16 12:01:42 -04:00
parent a8d8f02cf0 9249e17fe0
commit 8626e4a426
698 changed files with 6437 additions and 4542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/proc.c
View File

@@ -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 = {