udf: remove wrong prototype of udf_readdir
PATCH 1/5 udf: remove wrong prototype of udf_readdir
sparse generated:fs/udf/dir.c:78:5: warning: symbol 'udf_readdir' was not declared. Should it be static? there are 2 different prototypes of udf_readdir - remove them and move code around to make it still compile
--- fs/udf/dir.c | 118 +++++++++++++++++++++++++++------------------------------ 1 files changed, 56 insertions(+), 62 deletions(-)
fs/udf/dir.c +56 -62
@@ -36,68 +36,8 @@#include "udf_i.h" #include "udf_sb.h" -/* Prototypes for file operations */ -static int udf_readdir (struct file *,void *,filldir_t ); -static int do_udf_readdir (struct inode *,struct file *,filldir_t ,void *); - -/* readdir and lookup functions */ - -const struct file_operations udf_dir_operations = { - .read = generic_read_dir, - .readdir = udf_readdir, - .ioctl = udf_ioctl, - .fsync = udf_fsync_file, -}; - -/* -* udf_readdir -* -* PURPOSE -* Read a directory entry. -* -* DESCRIPTION -* Optional - sys_getdents() will return -ENOTDIR if this routine is not -* available. -* -* Refer to sys_getdents() in fs/readdir.c -* sys_getdents() -> . -* -* PRE-CONDITIONS -* filp Pointer to directory file. -* buf Pointer to directory entry buffer. -* filldir Pointer to filldir function. -* -* POST-CONDITIONS -* <return> >=0 on success. -* -* HISTORY -* July 1, 1997 - Andrew E. Mileski -* Written, tested, and released. -*/ - -int udf_readdir (struct file *filp,void *dirent,filldir_t filldir) -{ -struct inode *dir = filp->f_path.dentry->d_inode; -int result; - -lock_kernel (); - -if (filp->f_pos ==0 ) { -if (filldir (dirent,"." ,1 , filp->f_pos, dir->i_ino,DT_DIR ) <0 ) { -unlock_kernel (); -return 0 ; - } - filp->f_pos++; - } - - result =do_udf_readdir (dir, filp, filldir, dirent); -unlock_kernel (); -return result; -} - -static int -do_udf_readdir (struct inode *dir,struct file *filp,filldir_t filldir, -void *dirent) +static int do_udf_readdir (struct inode *dir,struct file *filp, +filldir_t filldir,void *dirent) {struct udf_fileident_bh fibh;struct fileIdentDesc *fi =NULL ;
@@ -244,3 +184,57 @@ do_udf_readdir(struct inode *dir, struct file *filp, filldir_t filldir,return 0 ; } + +/* +* udf_readdir +* +* PURPOSE +* Read a directory entry. +* +* DESCRIPTION +* Optional - sys_getdents() will return -ENOTDIR if this routine is not +* available. +* +* Refer to sys_getdents() in fs/readdir.c +* sys_getdents() -> . +* +* PRE-CONDITIONS +* filp Pointer to directory file. +* buf Pointer to directory entry buffer. +* filldir Pointer to filldir function. +* +* POST-CONDITIONS +* <return> >=0 on success. +* +* HISTORY +* July 1, 1997 - Andrew E. Mileski +* Written, tested, and released. +*/ + +static int udf_readdir (struct file *filp,void *dirent,filldir_t filldir) +{ +struct inode *dir = filp->f_path.dentry->d_inode; +int result; + +lock_kernel (); + +if (filp->f_pos ==0 ) { +if (filldir (dirent,"." ,1 , filp->f_pos, dir->i_ino,DT_DIR ) <0 ) { +unlock_kernel (); +return 0 ; + } + filp->f_pos++; + } + + result =do_udf_readdir (dir, filp, filldir, dirent); +unlock_kernel (); +return result; +} + +/* readdir and lookup functions */ +const struct file_operations udf_dir_operations = { + .read = generic_read_dir, + .readdir = udf_readdir, + .ioctl = udf_ioctl, + .fsync = udf_fsync_file, +};
--
1.5.3.4
Quoted 4 lines · On Fri, 21 Dec 2007 16:55:03 +0100 Marcin Slusarz <[email protected]>…
sparse generated:
fs/udf/dir.c:78:5: warning: symbol 'udf_readdir' was not declared. Should it be static? there are 2 different prototypes ofudf_readdir- remove them and move code around to make it still compile
Drat. I just applied six udf patches from you and now we have a new patch series of only five with no indication what changed.
I guess I really do need to apply my backlog in reverse time order.
Quoted 8 lines · Andrew Morton
Quoted 4 lines · On Fri, 21 Dec 2007 16:55:03 +0100 Marcin Slusarz <[email protected]>…
sparse generated:
fs/udf/dir.c:78:5: warning: symbol 'udf_readdir' was not declared. Should it be static? there are 2 different prototypes ofudf_readdir- remove them and move code around to make it still compile
Quoted 4 lines
Drat. I just applied six udf patches from you and now we have a new patch series of only five with no indication what changed.
I guess I really do need to apply my backlog in reverse time order.
I'm sorry for that. I added acked-by as Jan Kara suggested [1] and added better description for 3rd patch. 6th patch was dropped [2] because it should be cleaned up differently.
Marcin
[1] http://lkml.org/lkml/2007/12/20/151
[2] http://lkml.org/lkml/2007/12/17/201