new_inode_autonum: convert filesystems to use new function
Subsystems (22)
PATCH 2/3 new_inode_autonum: convert filesystems to use new function
This patch converts all in-tree filesystems that blindly use the i_ino value given by new_inode to use new_inode_autonum. Also fix up a few other cases where i_ino might not end up being unique.
arch/ia64/kernel/perfmon.c +1 -1
@@ -2170,7 +2170,7 @@ pfm_alloc_fd(struct file **cfile)/* * allocate a new inode */ - inode =new_inode (pfmfs_mnt->mnt_sb); + inode =new_inode_autonum (pfmfs_mnt->mnt_sb);if (!inode) goto out;DPRINT (("new inode ino=%ld @%p\n" , inode->i_ino, inode));
arch/powerpc/platforms/cell/spufs/inode.c +1 -1
@@ -79,7 +79,7 @@ spufs_new_inode(struct super_block *sb, {struct inode *inode; - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (!inode) goto out;
arch/s390/hypfs/inode.c +1 -1
@@ -84,7 +84,7 @@ static void hypfs_delete_tree(struct denstatic struct inode *hypfs_make_inode (struct super_block *sb,int mode) { -struct inode *ret =new_inode (sb); +struct inode *ret =new_inode_autonum (sb);if (ret) {struct hypfs_sb_info *hypfs_info = sb->s_fs_info;
drivers/infiniband/hw/ipath/ipath_fs.c +1 -1
@@ -51,7 +51,7 @@ static int ipathfs_mknod(struct inode *d void *data) {int error; -struct inode *inode =new_inode (dir->i_sb); +struct inode *inode =new_inode_autonum (dir->i_sb);if (!inode) { error = -EPERM ;
drivers/misc/ibmasm/ibmasmfs.c +1 -1
@@ -142,7 +142,7 @@ static int ibmasmfs_fill_super (struct sstatic struct inode *ibmasmfs_make_inode (struct super_block *sb,int mode) { -struct inode *ret =new_inode (sb); +struct inode *ret =new_inode_autonum (sb);if (ret) { ret->i_mode = mode;
drivers/oprofile/oprofilefs.c +1 -1
@@ -25,7 +25,7 @@ DEFINE_SPINLOCK(oprofilefs_lock);static struct inode *oprofilefs_get_inode (struct super_block * sb,int mode) { -struct inode * inode =new_inode (sb); +struct inode * inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
drivers/usb/core/inode.c +1 -1
@@ -243,7 +243,7 @@ static int remount(struct super_block *sstatic struct inode *usbfs_get_inode (struct super_block *sb,int mode,dev_t dev) { -struct inode *inode =new_inode (sb); +struct inode *inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
drivers/usb/gadget/inode.c +1 -1
@@ -2026,7 +2026,7 @@ gadgetfs_make_inode (struct super_block void *data, const struct file_operations *fops, int mode) { - struct inode *inode = new_inode (sb); + struct inode *inode = new_inode_autonum(sb);if (inode) { inode->i_mode = mode;
fs/9p/vfs_inode.c +1 -1
@@ -199,7 +199,7 @@ struct inode *v9fs_get_inode(struct supedprintk (DEBUG_VFS ,"super block: %p mode: %o\n" , sb, mode); - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode; inode->i_uid = current->fsuid;
fs/autofs4/inode.c +1 -1
@@ -419,7 +419,7 @@ fail_unlock:struct inode *autofs4_get_inode (struct super_block *sb,struct autofs_info *inf) { -struct inode *inode =new_inode (sb); +struct inode *inode =new_inode_autonum (sb);if (inode ==NULL )return NULL ;
fs/binfmt_misc.c +1 -1
@@ -499,7 +499,7 @@ static void entry_status(Node *e, char *static struct inode *bm_get_inode (struct super_block *sb,int mode) { -struct inode * inode =new_inode (sb); +struct inode * inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
fs/cifs/inode.c +5 -3
@@ -80,7 +80,7 @@ int cifs_get_inode_info_unix(struct inod/* get new inode */ if (*pinode ==NULL ) { - *pinode =new_inode (sb); + *pinode =new_inode_autonum (sb);if (*pinode ==NULL )return -ENOMEM ;/* Is an i_ino of zero legal? */
@@ -89,7 +89,9 @@ int cifs_get_inode_info_unix(struct inodif (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_SERVER_INUM ) { (*pinode)->i_ino = (unsigned long )findData.UniqueId; - }/* note ino incremented to unique num in new_inode */ + }else { + (*pinode)->i_ino =iunique (sb,0 ); + }insert_inode_hash (*pinode); }
@@ -418,7 +420,7 @@ int cifs_get_inode_info(struct inode **p/* BB EOPNOSUPP disable SERVER_INUM? */ }else /* do we need cast or hash to ino? */ (*pinode)->i_ino = inode_num; - }/* else ino incremented to unique num in new_inode*/ + }/* else ino incremented to unique num in new_inode_autonum*/ insert_inode_hash (*pinode); } inode = *pinode;
fs/configfs/inode.c +1 -1
@@ -133,7 +133,7 @@ static inline void set_inode_attr(structstruct inode *configfs_new_inode (mode_t mode,struct configfs_dirent * sd) { -struct inode * inode =new_inode (configfs_sb); +struct inode * inode =new_inode_autonum (configfs_sb);if (inode) { inode->i_blocks =0 ; inode->i_mapping->a_ops = &configfs_aops;
fs/debugfs/inode.c +1 -1
@@ -34,7 +34,7 @@ static int debugfs_mount_count;static struct inode *debugfs_get_inode (struct super_block *sb,int mode,dev_t dev) { -struct inode *inode =new_inode (sb); +struct inode *inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
fs/eventpoll.c +1 -1
@@ -1623,7 +1623,7 @@ static int eventpollfs_delete_dentry(strstatic struct inode *ep_eventpoll_inode (void ) {int error = -ENOMEM ; -struct inode *inode =new_inode (eventpoll_mnt->mnt_sb); +struct inode *inode =new_inode_autonum (eventpoll_mnt->mnt_sb);if (!inode) goto eexit_1;
fs/freevxfs/vxfs_inode.c +1 -1
@@ -261,7 +261,7 @@ vxfs_get_fake_inode(struct super_block * {struct inode *ip =NULL ; -if ((ip =new_inode (sbp))) { +if ((ip =new_inode_autonum (sbp))) {vxfs_iinit (ip, vip); ip->i_mapping->a_ops = &vxfs_aops; }
fs/fuse/control.c +1 -1
@@ -85,7 +85,7 @@ static struct dentry *fuse_ctl_add_dentrreturn NULL ; fc->ctl_dentry[fc->ctl_ndents++] = dentry; - inode =new_inode (fuse_control_sb); + inode =new_inode_autonum (fuse_control_sb);if (!inode)return NULL ;
fs/hugetlbfs/inode.c +1 -1
@@ -349,7 +349,7 @@ static struct inode *hugetlbfs_get_inode {struct inode *inode; - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (inode) {struct hugetlbfs_inode_info *info; inode->i_mode = mode;
fs/jfs/jfs_inode.c +1 -1
@@ -58,7 +58,7 @@ struct inode *ialloc(struct inode *parenstruct jfs_inode_info *jfs_inode;int rc; - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (!inode) {jfs_warn ("ialloc: new_inode returned NULL!" );return ERR_PTR (-ENOMEM );
fs/ocfs2/dlm/dlmfs.c +2 -2
@@ -325,7 +325,7 @@ static struct backing_dev_info dlmfs_bacstatic struct inode *dlmfs_get_root_inode (struct super_block *sb) { -struct inode *inode =new_inode (sb); +struct inode *inode =new_inode_autonum (sb);int mode =S_IFDIR |0755 ;struct dlmfs_inode_private *ip;
@@ -352,7 +352,7 @@ static struct inode *dlmfs_get_inode(str int mode) {struct super_block *sb = parent->i_sb; -struct inode * inode =new_inode (sb); +struct inode * inode =new_inode_autonum (sb);struct dlmfs_inode_private *ip;if (!inode)
fs/pipe.c +1 -1
@@ -839,7 +839,7 @@ static struct dentry_operations pipefs_dstatic struct inode *get_pipe_inode (void ) { -struct inode *inode =new_inode (pipe_mnt->mnt_sb); +struct inode *inode =new_inode_autonum (pipe_mnt->mnt_sb);struct pipe_inode_info *pipe;if (!inode)
fs/ramfs/inode.c +1 -1
@@ -52,7 +52,7 @@ static struct backing_dev_info ramfs_bacstruct inode *ramfs_get_inode (struct super_block *sb,int mode,dev_t dev) { -struct inode * inode =new_inode (sb); +struct inode * inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
fs/sysfs/inode.c +1 -1
@@ -123,7 +123,7 @@ static struct lock_class_key sysfs_inodestruct inode *sysfs_new_inode (mode_t mode,struct sysfs_dirent * sd) { -struct inode * inode =new_inode (sysfs_sb); +struct inode * inode =new_inode_autonum (sysfs_sb);if (inode) { inode->i_blocks =0 ; inode->i_mapping->a_ops = &sysfs_aops;
ipc/mqueue.c +1 -1
@@ -110,7 +110,7 @@ static struct inode *mqueue_get_inode(st {struct inode *inode; - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode; inode->i_uid = current->fsuid;
kernel/cpuset.c +1 -1
@@ -283,7 +283,7 @@ static struct backing_dev_info cpuset_bastatic struct inode *cpuset_new_inode (mode_t mode) { -struct inode *inode =new_inode (cpuset_sb); +struct inode *inode =new_inode_autonum (cpuset_sb);if (inode) { inode->i_mode = mode;
mm/shmem.c +1 -1
@@ -1354,7 +1354,7 @@ shmem_get_inode(struct super_block *sb,spin_unlock (&sbinfo->stat_lock); } - inode =new_inode (sb); + inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode; inode->i_uid = current->fsuid;
net/socket.c +1 -1
@@ -474,7 +474,7 @@ static struct socket *sock_alloc(void)struct inode *inode;struct socket *sock; - inode =new_inode (sock_mnt->mnt_sb); + inode =new_inode_autonum (sock_mnt->mnt_sb);if (!inode)return NULL ;
security/inode.c +1 -1
@@ -58,7 +58,7 @@ static struct file_operations default_fistatic struct inode *get_inode (struct super_block *sb,int mode,dev_t dev) { -struct inode *inode =new_inode (sb); +struct inode *inode =new_inode_autonum (sb);if (inode) { inode->i_mode = mode;
security/selinux/selinuxfs.c +1 -1
@@ -766,7 +766,7 @@ out:static struct inode *sel_make_inode (struct super_block *sb,int mode) { -struct inode *ret =new_inode (sb); +struct inode *ret =new_inode_autonum (sb);if (ret) { ret->i_mode = mode;
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines · Jeff Layton
This patch converts all in-tree filesystems that blindly use the
i_inovalue given bynew_inodeto usenew_inode_autonum. Also fix up a few other cases wherei_inomight not end up being unique.
After looking at this, since you have to change all of these filesystems anyway, I'm not sure there's a lot of value in having new_inode_autonum(); they all previously called new_inode() and then filled in a few fields of the new inode. Why not just call new_inode(), and add a call to inode->i_inum = iunique(sb, 0)? We don't have new_inode_autouid() or new_inode_autoatime(), why is i_ino special in this regard?
-Eric