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/ufs/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/ufs/namei.c')
| -rw-r--r-- | fs/ufs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c index e84c0ecf0730..a059ccd064ea 100644 --- a/fs/ufs/namei.c +++ b/fs/ufs/namei.c | |||
| @@ -355,7 +355,7 @@ out: | |||
| 355 | return err; | 355 | return err; |
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | struct inode_operations ufs_dir_inode_operations = { | 358 | const struct inode_operations ufs_dir_inode_operations = { |
| 359 | .create = ufs_create, | 359 | .create = ufs_create, |
| 360 | .lookup = ufs_lookup, | 360 | .lookup = ufs_lookup, |
| 361 | .link = ufs_link, | 361 | .link = ufs_link, |