linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2013-03-25T04:23:12Z

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/inode.c between commit ("vfs,proc: guarantee unique inodes
in /proc") from Linus' tree and commit
"procfs-improve-scaling-in-proc-v5" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc fs/proc/inode.c
index 38f0775,f53660a..0000000
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@@ -463,10 -464,10 +464,11 @@@ static const struct file_operations pro

struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
{
- struct inode *inode = iget_locked(sb, de->low_ino);
+ struct inode *inode = new_inode_pseudo(sb);
+ const struct file_operations *fops;

- if (inode && (inode->i_state & I_NEW)) {
+ if (inode) {
+ inode->i_ino = de->low_ino;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
PROC_I(inode)->pde = de;

@@@ -491,9 -494,11 +495,10 @@@
#endif
inode->i_fop = &proc_reg_file_ops;
} else {
- inode->i_fop = de->proc_fops;
+ inode->i_fop = fops;
}
}
+ rcu_read_unlock();
- unlock_new_inode(inode);
} else
pde_put(de);
return inode;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]