2.4.11 unused code in ext2
PATCH 1/1 2.4.11 unused code in ext2
the ext2_permission function prototype in include/linux/ext2_fs.h is never implemented. no big deal, just a little misleading. this appears to be leftover from 2.2.
the ext2_notify_change function is implemented in fs/ext2/inode.c but not used anywhere. this appears to be leftover from 2.2 when ext2_notify_change was part of super_operations. now that the corresponding functionality is provided by inode_operations->setattr, ext2 lets vfs handle with generic inode_setattr function. so this function appears to just waste space.
the patch below removes both. these are already removed from the -ac tree.
thanks,
-chris
fs/ext2/inode.c +0 -60
@@ -1148,63 +1148,3 @@ {return ext2_update_inode (inode,1 ); } - -int ext2_notify_change (struct dentry *dentry,struct iattr *iattr) -{ -struct inode *inode = dentry->d_inode; -int retval; -unsigned int flags; - - retval = -EPERM ; -if (iattr->ia_valid &ATTR_ATTR_FLAG && - ((!(iattr->ia_attr_flags &ATTR_FLAG_APPEND ) != - !(inode->u.ext2_i.i_flags &EXT2_APPEND_FL )) || - (!(iattr->ia_attr_flags &ATTR_FLAG_IMMUTABLE ) != - !(inode->u.ext2_i.i_flags &EXT2_IMMUTABLE_FL )))) { -if (!capable (CAP_LINUX_IMMUTABLE )) - goto out; - }else if ((current->fsuid != inode->i_uid) && !capable (CAP_FOWNER )) - goto out; - - retval =inode_change_ok (inode, iattr); -if (retval !=0 || (((iattr->ia_valid &ATTR_UID && iattr->ia_uid != inode->i_uid) || - (iattr->ia_valid &ATTR_GID && iattr->ia_gid != inode->i_gid)) && -DQUOT_TRANSFER (inode, iattr))) - goto out; - -inode_setattr (inode, iattr); - - flags = iattr->ia_attr_flags; -if (flags &ATTR_FLAG_SYNCRONOUS ) { - inode->i_flags |=S_SYNC ; - inode->u.ext2_i.i_flags |=EXT2_SYNC_FL ; - }else { - inode->i_flags &= ~S_SYNC ; - inode->u.ext2_i.i_flags &= ~EXT2_SYNC_FL ; - } -if (flags &ATTR_FLAG_NOATIME ) { - inode->i_flags |=S_NOATIME ; - inode->u.ext2_i.i_flags |=EXT2_NOATIME_FL ; - }else { - inode->i_flags &= ~S_NOATIME ; - inode->u.ext2_i.i_flags &= ~EXT2_NOATIME_FL ; - } -if (flags &ATTR_FLAG_APPEND ) { - inode->i_flags |=S_APPEND ; - inode->u.ext2_i.i_flags |=EXT2_APPEND_FL ; - }else { - inode->i_flags &= ~S_APPEND ; - inode->u.ext2_i.i_flags &= ~EXT2_APPEND_FL ; - } -if (flags &ATTR_FLAG_IMMUTABLE ) { - inode->i_flags |=S_IMMUTABLE ; - inode->u.ext2_i.i_flags |=EXT2_IMMUTABLE_FL ; - }else { - inode->i_flags &= ~S_IMMUTABLE ; - inode->u.ext2_i.i_flags &= ~EXT2_IMMUTABLE_FL ; - } -mark_inode_dirty (inode); -out: -return retval; -} -
include/linux/ext2_fs.h +0 -3
@@ -545,9 +545,6 @@# define ATTRIB_NORET __attribute__((noreturn))# define NORET_AND noreturn, -/* acl.c */ -extern int ext2_permission (struct inode *,int ); -/* balloc.c */ extern int ext2_bg_has_super (struct super_block *sb,int group);extern unsigned long ext2_bg_num_gdb (struct super_block *sb,int group);