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

Commit d8c76e6f authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[PATCH] r/o bind mount prepwork: inc_nlink() helper 



This is mostly included for parity with dec_nlink(), where we will have some
more hooks.  This one should stay pretty darn straightforward for now.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a53c3a7

drivers/infiniband/hw/ipath/ipath_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry, 
	inode->i_private = data;

	if ((mode & S_IFMT) == S_IFDIR) {

		inode->i_op = &simple_dir_inode_operations;

		inode->i_nlink++;

		dir->i_nlink++;

		inc_nlink(inode);

		inc_nlink(dir);

	}



	inode->i_fop = fops;

drivers/usb/core/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de 
			inode->i_fop = &simple_dir_operations;



			/* directory inodes start off with i_nlink == 2 (for "." entry) */

			inode->i_nlink++;

			inc_nlink(inode);

			break;

		}

	}
@@ -295,7 +295,7 @@ static int usbfs_mkdir (struct inode *dir, struct dentry *dentry, int mode) 
	mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;

	res = usbfs_mknod (dir, dentry, mode, 0);

	if (!res)

		dir->i_nlink++;

		inc_nlink(dir);

	return res;

}

fs/9p/vfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode) 
			inode->i_op = &v9fs_symlink_inode_operations;

			break;

		case S_IFDIR:

			inode->i_nlink++;

			inc_nlink(inode);

			if(v9ses->extended)

				inode->i_op = &v9fs_dir_inode_operations_ext;

			else

fs/autofs/root.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int autofs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	ent->dentry = dentry;

	autofs_hash_insert(dh,ent);



	dir->i_nlink++;

	inc_nlink(dir);

	d_instantiate(dentry, iget(dir->i_sb,ino));

	unlock_kernel();

fs/autofs4/root.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, int mode) 
	if (p_ino && dentry->d_parent != dentry)

		atomic_inc(&p_ino->count);

	ino->inode = inode;

	dir->i_nlink++;

	inc_nlink(dir);

	dir->i_mtime = CURRENT_TIME;



	return 0;