1 Index: linux-2.6.16.i686/fs/cifs/dir.c
2 ===================================================================
3 --- linux-2.6.16.i686.orig/fs/cifs/dir.c 2006-05-30 15:47:03.000000000 +0800
4 +++ linux-2.6.16.i686/fs/cifs/dir.c 2006-05-30 21:11:39.000000000 +0800
8 if(nd && (nd->flags & LOOKUP_OPEN)) {
9 - int oflags = nd->intent.open.flags;
10 + int oflags = nd->intent.flags;
13 if (oflags & FMODE_READ)
14 Index: linux-2.6.16.i686/fs/nfs/dir.c
15 ===================================================================
16 --- linux-2.6.16.i686.orig/fs/nfs/dir.c 2006-03-20 13:53:29.000000000 +0800
17 +++ linux-2.6.16.i686/fs/nfs/dir.c 2006-05-30 21:10:01.000000000 +0800
20 if (nd == NULL || nfs_lookup_check_intent(nd, LOOKUP_CREATE) == 0)
22 - return (nd->intent.open.flags & O_EXCL) != 0;
23 + return (nd->intent.it_flags & O_EXCL) != 0;
26 static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
28 if (nd->flags & LOOKUP_DIRECTORY)
30 /* Are we trying to write to a read only partition? */
31 - if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
32 + if (IS_RDONLY(dir) && (nd->intent.it_flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
37 dentry->d_op = NFS_PROTO(dir)->dentry_ops;
39 /* Let vfs_create() deal with O_EXCL */
40 - if (nd->intent.open.flags & O_EXCL) {
41 + if (nd->intent.it_flags & O_EXCL) {
49 - if (nd->intent.open.flags & O_CREAT) {
50 + if (nd->intent.it_flags & O_CREAT) {
51 nfs_begin_data_update(dir);
52 res = nfs4_atomic_open(dir, dentry, nd);
53 nfs_end_data_update(dir);
58 - if (!(nd->intent.open.flags & O_NOFOLLOW))
59 + if (!(nd->intent.it_flags & O_NOFOLLOW))
64 /* NFS only supports OPEN on regular files */
65 if (!S_ISREG(inode->i_mode))
67 - openflags = nd->intent.open.flags;
68 + openflags = nd->intent.it_flags;
69 /* We cannot do exclusive creation on a positive dentry */
70 if ((openflags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL))
73 attr.ia_valid = ATTR_MODE;
75 if (nd && (nd->flags & LOOKUP_CREATE))
76 - open_flags = nd->intent.open.flags;
77 + open_flags = nd->intent.it_flags;
80 nfs_begin_data_update(dir);
81 Index: linux-2.6.16.i686/fs/nfs/nfs4proc.c
82 ===================================================================
83 --- linux-2.6.16.i686.orig/fs/nfs/nfs4proc.c 2006-03-20 13:53:29.000000000 +0800
84 +++ linux-2.6.16.i686/fs/nfs/nfs4proc.c 2006-05-30 21:11:00.000000000 +0800
86 ctx = (struct nfs_open_context *)filp->private_data;
89 - nfs4_close_state(state, nd->intent.open.flags);
90 + nfs4_close_state(state, nd->intent.flags);
94 @@ -1232,19 +1232,19 @@
97 if (nd->flags & LOOKUP_CREATE) {
98 - attr.ia_mode = nd->intent.open.create_mode;
99 + attr.ia_mode = nd->intent.create_mode;
100 attr.ia_valid = ATTR_MODE;
101 if (!IS_POSIXACL(dir))
102 attr.ia_mode &= ~current->fs->umask;
105 - BUG_ON(nd->intent.open.flags & O_CREAT);
106 + BUG_ON(nd->intent.flags & O_CREAT);
109 cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
111 return (struct dentry *)cred;
112 - state = nfs4_do_open(dir, dentry, nd->intent.open.flags, &attr, cred);
113 + state = nfs4_do_open(dir, dentry, nd->intent.flags, &attr, cred);
116 if (PTR_ERR(state) == -ENOENT)