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
include/linux/nfs_xdr.h
View file

@ -1380,7 +1380,7 @@ struct nfs_rpc_ops {
int (*readlink)(struct inode *, struct page *, unsigned int,
unsigned int);
int (*create) (struct inode *, struct dentry *,
struct iattr *, int, struct nfs_open_context *);
struct iattr *, int);
int (*remove) (struct inode *, struct qstr *);
void (*unlink_setup) (struct rpc_message *, struct inode *dir);
void (*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);