/usr/src/kernel-patches/lustre/patches/nfs-cifs-intent-2.6-fc5.patch is in linux-patch-lustre 1.8.5+dfsg-3ubuntu1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | Index: linux-2.6.16.i686/fs/cifs/dir.c
===================================================================
--- linux-2.6.16.i686.orig/fs/cifs/dir.c 2006-05-30 15:47:03.000000000 +0800
+++ linux-2.6.16.i686/fs/cifs/dir.c 2006-05-30 21:11:39.000000000 +0800
@@ -147,7 +147,7 @@
}
if(nd && (nd->flags & LOOKUP_OPEN)) {
- int oflags = nd->intent.open.flags;
+ int oflags = nd->intent.flags;
desiredAccess = 0;
if (oflags & FMODE_READ)
Index: linux-2.6.16.i686/fs/nfs/dir.c
===================================================================
--- linux-2.6.16.i686.orig/fs/nfs/dir.c 2006-03-20 13:53:29.000000000 +0800
+++ linux-2.6.16.i686/fs/nfs/dir.c 2006-05-30 21:10:01.000000000 +0800
@@ -831,7 +831,7 @@
return 0;
if (nd == NULL || nfs_lookup_check_intent(nd, LOOKUP_CREATE) == 0)
return 0;
- return (nd->intent.open.flags & O_EXCL) != 0;
+ return (nd->intent.it_flags & O_EXCL) != 0;
}
static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
@@ -902,7 +902,7 @@
if (nd->flags & LOOKUP_DIRECTORY)
return 0;
/* Are we trying to write to a read only partition? */
- if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
+ if (IS_RDONLY(dir) && (nd->intent.it_flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
return 0;
return 1;
}
@@ -923,7 +923,7 @@
dentry->d_op = NFS_PROTO(dir)->dentry_ops;
/* Let vfs_create() deal with O_EXCL */
- if (nd->intent.open.flags & O_EXCL) {
+ if (nd->intent.it_flags & O_EXCL) {
d_add(dentry, NULL);
goto out;
}
@@ -938,7 +938,7 @@
goto out;
}
- if (nd->intent.open.flags & O_CREAT) {
+ if (nd->intent.it_flags & O_CREAT) {
nfs_begin_data_update(dir);
res = nfs4_atomic_open(dir, dentry, nd);
nfs_end_data_update(dir);
@@ -957,7 +957,7 @@
case -ENOTDIR:
goto no_open;
case -ELOOP:
- if (!(nd->intent.open.flags & O_NOFOLLOW))
+ if (!(nd->intent.it_flags & O_NOFOLLOW))
goto no_open;
/* case -EINVAL: */
default:
@@ -993,7 +993,7 @@
/* NFS only supports OPEN on regular files */
if (!S_ISREG(inode->i_mode))
goto no_open;
- openflags = nd->intent.open.flags;
+ openflags = nd->intent.it_flags;
/* We cannot do exclusive creation on a positive dentry */
if ((openflags & (O_CREAT|O_EXCL)) == (O_CREAT|O_EXCL))
goto no_open;
@@ -1126,7 +1126,7 @@
attr.ia_valid = ATTR_MODE;
if (nd && (nd->flags & LOOKUP_CREATE))
- open_flags = nd->intent.open.flags;
+ open_flags = nd->intent.it_flags;
lock_kernel();
nfs_begin_data_update(dir);
Index: linux-2.6.16.i686/fs/nfs/nfs4proc.c
===================================================================
--- linux-2.6.16.i686.orig/fs/nfs/nfs4proc.c 2006-03-20 13:53:29.000000000 +0800
+++ linux-2.6.16.i686/fs/nfs/nfs4proc.c 2006-05-30 21:11:00.000000000 +0800
@@ -1220,7 +1220,7 @@
ctx = (struct nfs_open_context *)filp->private_data;
ctx->state = state;
} else
- nfs4_close_state(state, nd->intent.open.flags);
+ nfs4_close_state(state, nd->intent.flags);
}
struct dentry *
@@ -1232,19 +1232,19 @@
struct dentry *res;
if (nd->flags & LOOKUP_CREATE) {
- attr.ia_mode = nd->intent.open.create_mode;
+ attr.ia_mode = nd->intent.create_mode;
attr.ia_valid = ATTR_MODE;
if (!IS_POSIXACL(dir))
attr.ia_mode &= ~current->fs->umask;
} else {
attr.ia_valid = 0;
- BUG_ON(nd->intent.open.flags & O_CREAT);
+ BUG_ON(nd->intent.flags & O_CREAT);
}
cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
if (IS_ERR(cred))
return (struct dentry *)cred;
- state = nfs4_do_open(dir, dentry, nd->intent.open.flags, &attr, cred);
+ state = nfs4_do_open(dir, dentry, nd->intent.flags, &attr, cred);
put_rpccred(cred);
if (IS_ERR(state)) {
if (PTR_ERR(state) == -ENOENT)
|