diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 19:23:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 19:23:12 -0400 |
| commit | 3ae5080f4c2e293229508dabe7c8a90af4e4c460 (patch) | |
| tree | 9cb11f26905a82b7fac9d3b8f9d61d58bc5c94b0 /fs/proc/base.c | |
| parent | 2c9e15a011c55ff96b2b8d2b126d1b9a96abba20 (diff) | |
| parent | aabb8fdb41128705fd1627f56fdd571e45fdbcdb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits)
fs: avoid I_NEW inodes
Merge code for single and multiple-instance mounts
Remove get_init_pts_sb()
Move common mknod_ptmx() calls into caller
Parse mount options just once and copy them to super block
Unroll essentials of do_remount_sb() into devpts
vfs: simple_set_mnt() should return void
fs: move bdev code out of buffer.c
constify dentry_operations: rest
constify dentry_operations: configfs
constify dentry_operations: sysfs
constify dentry_operations: JFS
constify dentry_operations: OCFS2
constify dentry_operations: GFS2
constify dentry_operations: FAT
constify dentry_operations: FUSE
constify dentry_operations: procfs
constify dentry_operations: ecryptfs
constify dentry_operations: CIFS
constify dentry_operations: AFS
...
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index beaa0ce3b82e..aef6d55b7de6 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -1545,7 +1545,7 @@ static int pid_delete_dentry(struct dentry * dentry) | |||
| 1545 | return !proc_pid(dentry->d_inode)->tasks[PIDTYPE_PID].first; | 1545 | return !proc_pid(dentry->d_inode)->tasks[PIDTYPE_PID].first; |
| 1546 | } | 1546 | } |
| 1547 | 1547 | ||
| 1548 | static struct dentry_operations pid_dentry_operations = | 1548 | static const struct dentry_operations pid_dentry_operations = |
| 1549 | { | 1549 | { |
| 1550 | .d_revalidate = pid_revalidate, | 1550 | .d_revalidate = pid_revalidate, |
| 1551 | .d_delete = pid_delete_dentry, | 1551 | .d_delete = pid_delete_dentry, |
| @@ -1717,7 +1717,7 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
| 1717 | return 0; | 1717 | return 0; |
| 1718 | } | 1718 | } |
| 1719 | 1719 | ||
| 1720 | static struct dentry_operations tid_fd_dentry_operations = | 1720 | static const struct dentry_operations tid_fd_dentry_operations = |
| 1721 | { | 1721 | { |
| 1722 | .d_revalidate = tid_fd_revalidate, | 1722 | .d_revalidate = tid_fd_revalidate, |
| 1723 | .d_delete = pid_delete_dentry, | 1723 | .d_delete = pid_delete_dentry, |
| @@ -2339,7 +2339,7 @@ static int proc_base_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
| 2339 | return 0; | 2339 | return 0; |
| 2340 | } | 2340 | } |
| 2341 | 2341 | ||
| 2342 | static struct dentry_operations proc_base_dentry_operations = | 2342 | static const struct dentry_operations proc_base_dentry_operations = |
| 2343 | { | 2343 | { |
| 2344 | .d_revalidate = proc_base_revalidate, | 2344 | .d_revalidate = proc_base_revalidate, |
| 2345 | .d_delete = pid_delete_dentry, | 2345 | .d_delete = pid_delete_dentry, |