Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8e1343f authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

iget: stop the SYSV filesystem from using iget() and read_inode() 



Stop the SYSV filesystem from using iget() and read_inode().  Replace
sysv_read_inode() with sysv_iget(), and call that instead of iget().
sysv_iget() then uses iget_locked() directly and returns a proper error code
instead of an inode in the event of an error.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78cc9120

fs/sysv/inode.c

+16 −9
Original line number Diff line number Diff line
@@ -169,20 +169,27 @@ void sysv_set_inode(struct inode *inode, dev_t rdev) 
		init_special_inode(inode, inode->i_mode, rdev);

}



static void sysv_read_inode(struct inode *inode)

struct inode *sysv_iget(struct super_block *sb, unsigned int ino)

{

	struct super_block * sb = inode->i_sb;

	struct sysv_sb_info * sbi = SYSV_SB(sb);

	struct buffer_head * bh;

	struct sysv_inode * raw_inode;

	struct sysv_inode_info * si;

	unsigned int block, ino = inode->i_ino;

	struct inode *inode;

	unsigned int block;



	if (!ino || ino > sbi->s_ninodes) {

		printk("Bad inode number on dev %s: %d is out of range\n",

		       inode->i_sb->s_id, ino);

		goto bad_inode;

		       sb->s_id, ino);

		return ERR_PTR(-EIO);

	}



	inode = iget_locked(sb, ino);

	if (!inode)

		return ERR_PTR(-ENOMEM);

	if (!(inode->i_state & I_NEW))

		return inode;



	raw_inode = sysv_raw_inode(sb, ino, &bh);

	if (!raw_inode) {

		printk("Major problem: unable to read inode from dev %s\n",
@@ -214,11 +221,12 @@ static void sysv_read_inode(struct inode *inode) 
			       old_decode_dev(fs32_to_cpu(sbi, si->i_data[0])));

	else

		sysv_set_inode(inode, 0);

	return;

	unlock_new_inode(inode);

	return inode;



bad_inode:

	make_bad_inode(inode);

	return;

	iget_failed(inode);

	return ERR_PTR(-EIO);

}



static struct buffer_head * sysv_update_inode(struct inode * inode)
@@ -328,7 +336,6 @@ static void init_once(struct kmem_cache *cachep, void *p) 
const struct super_operations sysv_sops = {

	.alloc_inode	= sysv_alloc_inode,

	.destroy_inode	= sysv_destroy_inode,

	.read_inode	= sysv_read_inode,

	.write_inode	= sysv_write_inode,

	.delete_inode	= sysv_delete_inode,

	.put_super	= sysv_put_super,

fs/sysv/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ static struct dentry *sysv_lookup(struct inode * dir, struct dentry * dentry, st 
	ino = sysv_inode_by_name(dentry);



	if (ino) {

		inode = iget(dir->i_sb, ino);

		if (!inode)

			return ERR_PTR(-EACCES);

		inode = sysv_iget(dir->i_sb, ino);

		if (IS_ERR(inode))

			return ERR_CAST(inode);

	}

	d_add(dentry, inode);

	return NULL;

fs/sysv/super.c

+2 −2
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ static int complete_read_super(struct super_block *sb, int silent, int size) 
	sb->s_magic = SYSV_MAGIC_BASE + sbi->s_type;

	/* set up enough so that it can read an inode */

	sb->s_op = &sysv_sops;

	root_inode = iget(sb,SYSV_ROOT_INO);

	if (!root_inode || is_bad_inode(root_inode)) {

	root_inode = sysv_iget(sb, SYSV_ROOT_INO);

	if (IS_ERR(root_inode)) {

		printk("SysV FS: get root inode failed\n");

		return 0;

	}

fs/sysv/sysv.h

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ extern int __sysv_write_begin(struct file *file, struct address_space *mapping, 
			struct page **pagep, void **fsdata);



/* inode.c */

extern struct inode *sysv_iget(struct super_block *, unsigned int);

extern int sysv_write_inode(struct inode *, int);

extern int sysv_sync_inode(struct inode *);

extern int sysv_sync_file(struct file *, struct dentry *, int);