forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '9249e17fe0' 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
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/nfs3proc.c
View file

@ -314,7 +314,7 @@ static void nfs3_free_createdata(struct nfs3_createdata *data)
*/
static int
nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
int flags, struct nfs_open_context *ctx)
int flags)
{
struct nfs3_createdata *data;
umode_t mode = sattr->ia_mode;