p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

f_fs: saner API for ffs_sb_create_file() 

make it return dentry instead of inode

Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-09-03 13:32:19 -04:00
parent 9bb8730ed3
commit 1bb27cacf4
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/gadget/function/f_fs.c
View File

@ -164,10 +164,9 @@ struct ffs_desc_helper {
static int __must_check ffs_epfiles_create(struct ffs_data *ffs); static int __must_check ffs_epfiles_create(struct ffs_data *ffs);
static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count); static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count);
static struct inode *__must_check static struct dentry *
ffs_sb_create_file(struct super_block *sb, const char *name, void *data, ffs_sb_create_file(struct super_block *sb, const char *name, void *data,
const struct file_operations *fops, const struct file_operations *fops);
struct dentry **dentry_p);
/* Devices management *******************************************************/ /* Devices management *******************************************************/
@ -1096,10 +1095,9 @@ ffs_sb_make_inode(struct super_block *sb, void *data,
} }
/* Create "regular" file */ /* Create "regular" file */
static struct inode *ffs_sb_create_file(struct super_block *sb, static struct dentry *ffs_sb_create_file(struct super_block *sb,
const char *name, void *data, const char *name, void *data,
const struct file_operations *fops, const struct file_operations *fops)
struct dentry **dentry_p)
{ {
struct ffs_data *ffs = sb->s_fs_info; struct ffs_data *ffs = sb->s_fs_info;
struct dentry *dentry; struct dentry *dentry;
@ -1118,10 +1116,7 @@ static struct inode *ffs_sb_create_file(struct super_block *sb,
} }
d_add(dentry, inode); d_add(dentry, inode);
if (dentry_p) return dentry;
*dentry_p = dentry;
return inode;
} }
/* Super block */ /* Super block */
@ -1166,7 +1161,7 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
/* EP0 file */ /* EP0 file */
if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs, if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs,
&ffs_ep0_operations, NULL))) &ffs_ep0_operations)))
return -ENOMEM; return -ENOMEM;
return 0; return 0;
@ -1535,9 +1530,10 @@ static int ffs_epfiles_create(struct ffs_data *ffs)
mutex_init(&epfile->mutex); mutex_init(&epfile->mutex);
init_waitqueue_head(&epfile->wait); init_waitqueue_head(&epfile->wait);
sprintf(epfiles->name, "ep%u", i); sprintf(epfiles->name, "ep%u", i);
if (!unlikely(ffs_sb_create_file(ffs->sb, epfiles->name, epfile, epfile->dentry = ffs_sb_create_file(ffs->sb, epfiles->name,
&ffs_epfile_operations, epfile,
&epfile->dentry))) { &ffs_epfile_operations);
if (unlikely(!epfile->dentry)) {
ffs_epfiles_destroy(epfiles, i - 1); ffs_epfiles_destroy(epfiles, i - 1);
return -ENOMEM; return -ENOMEM;
} }