diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/udf/namei.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/udf/namei.c')
| -rw-r--r-- | fs/udf/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 73163325e5ec..fe361cd19a98 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c | |||
| @@ -1308,7 +1308,7 @@ end_rename: | |||
| 1308 | return retval; | 1308 | return retval; |
| 1309 | } | 1309 | } |
| 1310 | 1310 | ||
| 1311 | struct inode_operations udf_dir_inode_operations = { | 1311 | const struct inode_operations udf_dir_inode_operations = { |
| 1312 | .lookup = udf_lookup, | 1312 | .lookup = udf_lookup, |
| 1313 | .create = udf_create, | 1313 | .create = udf_create, |
| 1314 | .link = udf_link, | 1314 | .link = udf_link, |