From: Daniel Walter <dwalter@sigma-star.at>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, computersforpeace@gmail.com,
dwmw2@infradead.org, boris.brezillon@free-electrons.com,
Richard Weinberger <richard@nod.at>
Subject: [PATCH v2 23/46] mtd: nandsim: Unify file backend init logic
Date: Wed, 21 Sep 2016 11:51:42 +0200 [thread overview]
Message-ID: <e99cacb165395631be40e9f8994dc086327ce7e5.1474450296.git.dwalter@sigma-star.at> (raw)
In-Reply-To: <cover.1474450295.git.dwalter@sigma-star.at>
From: Richard Weinberger <richard@nod.at>
file and cache file backend do more or less the same,
so share some code.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/mtd/nand/nandsim.c | 102 ++++++++++++++++++++++++++++++---------------
1 file changed, 68 insertions(+), 34 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 816d795..56a2904 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -312,6 +312,7 @@ struct ns_ram_data {
struct ns_cachefile_data {
struct file *cfile; /* Open file */
+ bool file_opened; /* False when we operate on an already opened file */
unsigned long *pages_written; /* Which pages have been written */
void *file_buf;
struct page *held_pages[NS_MAX_HELD_PAGES];
@@ -637,25 +638,70 @@ static int ns_ram_init(struct nandsim *ns, struct nandsim_params *nsparam)
return 0;
}
-static int ns_cachefile_init(struct nandsim *ns, struct nandsim_params *nsparam)
+static struct file *get_file_from_nsparam(struct nandsim_params *nsparam, bool *opened)
{
- struct file *cfile;
int err;
- struct ns_cachefile_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
+ struct file *file;
+ struct inode *inode;
- cfile = filp_open(nsparam->cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600);
- if (IS_ERR(cfile))
- return PTR_ERR(cfile);
- if (!(cfile->f_mode & FMODE_CAN_READ)) {
+ if (nsparam->cache_file) {
+ file = filp_open(nsparam->cache_file, O_CREAT | O_RDWR | O_LARGEFILE, 0600);
+ if (IS_ERR(file))
+ return file;
+
+ *opened = true;
+ } else {
+ file = fget(nsparam->file_fd);
+ if (!file)
+ return ERR_PTR(-EBADF);
+
+ *opened = false;
+ }
+
+ inode = file->f_mapping->host;
+ if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode)) {
+ NS_ERR("alloc_device: Backend file is not a regular file nor a block device\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ if (!(file->f_mode & FMODE_CAN_READ)) {
NS_ERR("alloc_device: cache file not readable\n");
err = -EINVAL;
- goto err_close;
+ goto out;
}
- if (!(cfile->f_mode & FMODE_CAN_WRITE)) {
+
+ if (!(file->f_mode & FMODE_CAN_WRITE)) {
NS_ERR("alloc_device: cache file not writeable\n");
err = -EINVAL;
- goto err_close;
+ goto out;
}
+
+ return file;
+
+out:
+ if (*opened)
+ filp_close(file, NULL);
+ else
+ fput(file);
+
+ return ERR_PTR(err);
+}
+
+static int ns_cachefile_init(struct nandsim *ns, struct nandsim_params *nsparam)
+{
+ int err;
+ struct ns_cachefile_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
+
+ if (!data)
+ return -ENOMEM;
+
+ data->cfile = get_file_from_nsparam(nsparam, &data->file_opened);
+ if (IS_ERR(data->cfile)) {
+ err = PTR_ERR(data->cfile);
+ goto out;
+ }
+
data->pages_written = vzalloc(BITS_TO_LONGS(ns->geom.pgnum) *
sizeof(unsigned long));
if (!data->pages_written) {
@@ -669,7 +715,6 @@ static int ns_cachefile_init(struct nandsim *ns, struct nandsim_params *nsparam)
err = -ENOMEM;
goto err_free;
}
- data->cfile = cfile;
ns->backend_data = data;
@@ -678,15 +723,16 @@ static int ns_cachefile_init(struct nandsim *ns, struct nandsim_params *nsparam)
err_free:
vfree(data->pages_written);
err_close:
- filp_close(cfile, NULL);
+ filp_close(data->cfile, NULL);
+out:
+ kfree(data);
return err;
}
static int ns_file_init(struct nandsim *ns, struct nandsim_params *nsparam)
{
int ret;
- struct file *file;
- struct inode *inode;
+ bool dummy;
struct ns_file_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) {
@@ -694,27 +740,12 @@ static int ns_file_init(struct nandsim *ns, struct nandsim_params *nsparam)
goto out;
}
- file = fget(nsparam->file_fd);
- if (!file) {
- ret = -EBADF;
+ data->file = get_file_from_nsparam(nsparam, &dummy);
+ if (IS_ERR(data->file)) {
+ ret = PTR_ERR(data->file);
goto out_free;
}
- inode = file->f_mapping->host;
- if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode)) {
- NS_ERR("alloc_device: Backend file is not a regular file nor a block device\n");
- ret = -EINVAL;
- goto out_put;
- }
-
- if (!(file->f_mode & FMODE_WRITE)) {
- NS_ERR("alloc_device: Backend file is not writeable\n");
- ret = -EINVAL;
- goto out_put;
- }
-
- data->file = file;
-
data->file_buf = kmalloc(ns->geom.pgszoob, GFP_KERNEL);
if (!data->file_buf) {
NS_ERR("alloc_device: unable to allocate file buf\n");
@@ -728,7 +759,7 @@ static int ns_file_init(struct nandsim *ns, struct nandsim_params *nsparam)
return ret;
out_put:
- fput(file);
+ fput(data->file);
out_free:
kfree(data);
out:
@@ -792,7 +823,10 @@ static void ns_cachefile_destroy(struct nandsim *ns)
kfree(data->file_buf);
vfree(data->pages_written);
- filp_close(data->cfile, NULL);
+ if (data->file_opened)
+ filp_close(data->cfile, NULL);
+ else
+ fput(data->cfile);
kfree(data);
}
--
2.8.3
next prev parent reply other threads:[~2016-09-21 9:51 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 9:43 [PATCH v2 00/46] Nandsim facelift (part I of II) Daniel Walter
2016-09-21 9:43 ` [PATCH v2 01/46] mtdpart: Propagate _get/put_device() Daniel Walter
2016-09-21 10:15 ` Boris Brezillon
2016-09-28 20:16 ` Brian Norris
2016-12-14 19:24 ` Karl Beldan
2016-12-14 21:09 ` Brian Norris
2016-12-14 21:12 ` Richard Weinberger
2016-12-14 23:40 ` Brian Norris
2016-12-15 7:09 ` Karl Beldan
2016-12-15 7:51 ` Richard Weinberger
2016-12-28 18:53 ` Karl Beldan
2016-09-21 9:44 ` [PATCH v2 02/46] mtd: nand: Provide nand_cleanup() function to free NAND related resources Daniel Walter
2016-09-21 9:58 ` Boris Brezillon
2016-09-21 12:43 ` kbuild test robot
2016-09-21 14:25 ` Boris Brezillon
2016-09-21 14:38 ` Daniel Walter
2016-09-21 14:42 ` Boris Brezillon
2016-09-21 9:45 ` [PATCH v2 03/46] mtd: Don't unconditionally unregister reboot notifier Daniel Walter
2016-09-21 14:31 ` Boris Brezillon
2016-09-21 14:33 ` Daniel Walter
2016-10-09 5:20 ` Brian Norris
2016-09-21 9:45 ` [PATCH v2 04/46] mtd: Don't unconditionally execute remove notifiers Daniel Walter
2016-09-21 9:46 ` [PATCH v2 05/46] mtd: Don't print a scary message when trying to remove a busy MTD Daniel Walter
2016-09-21 9:46 ` [PATCH v2 06/46] mtd: nandsim: Add basic control file support Daniel Walter
2016-09-21 9:47 ` [PATCH v2 07/46] mtd: nandsim: Begin with removal of global state Daniel Walter
2016-09-21 9:47 ` [PATCH v2 08/46] mtd: nandsim: Kill global nsmtd Daniel Walter
2016-09-21 9:47 ` [PATCH v2 09/46] mtd: nandsim: Don't directly use module parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 10/46] mtd: nandsim: Add helper functions for pointer magic Daniel Walter
2016-09-21 9:48 ` [PATCH v2 11/46] mtd: nandsim: Factor out nandsim parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 12/46] mtd: nandsim: Make debugfs logic multi instance capable Daniel Walter
2016-09-21 9:49 ` [PATCH v2 13/46] mtd: nandsim: Add final logic for multiple instances Daniel Walter
2016-09-21 9:49 ` [PATCH v2 14/46] mtd: nandsim: Add simulator id to MTD parition name Daniel Walter
2016-09-21 9:49 ` [PATCH v2 15/46] mtd: nandsim: Introduce backend operations Daniel Walter
2016-09-21 9:49 ` [PATCH v2 16/46] mtd: nandsim: Print error when backend init failed Daniel Walter
2016-09-21 9:50 ` [PATCH v2 17/46] mtd: nandsim: Allow external backends Daniel Walter
2016-09-21 9:50 ` [PATCH v2 18/46] mtd: nandsim: Add basic support for a file backend Daniel Walter
2016-09-21 9:50 ` [PATCH v2 19/46] mtd: nandsim: UAPI v1 Daniel Walter
2016-11-20 10:13 ` Boris Brezillon
2016-09-21 9:51 ` [PATCH v2 20/46] mtd: nandsim: Implement preliminary constructor function Daniel Walter
2016-09-21 9:51 ` [PATCH v2 21/46] mtd: nandsim: Implement preliminary destructor function Daniel Walter
2016-09-21 12:56 ` kbuild test robot
2016-09-21 9:51 ` [PATCH v2 22/46] mtd: nandsim: Cleanup destroy handlers Daniel Walter
2016-09-21 9:51 ` Daniel Walter [this message]
2016-09-21 9:51 ` [PATCH v2 24/46] mtd: nandsim: Wire up NANDSIM_MODE_CACHEFILE ioctl mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 25/46] mtd: nandsim: Print backend name Daniel Walter
2016-09-21 9:52 ` [PATCH v2 26/46] mtd: nandsim: use the existing output macros Daniel Walter
2016-09-21 9:52 ` [PATCH v2 27/46] mtd: nandsim: Add no_oob mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 28/46] mtd: nandsim: Refine exports Daniel Walter
2016-09-21 9:54 ` [PATCH v2 29/46] um: Add nandsim backend driver Daniel Walter
2016-09-21 9:54 ` [PATCH v2 30/46] mtd: nandsim: Use pr_ style logging Daniel Walter
2016-09-21 9:54 ` [PATCH v2 31/46] mtd: nandsim: Remove NS_RAW_OFFSET_OOB Daniel Walter
2016-09-21 9:54 ` [PATCH v2 32/46] mtd: nandsim: Remove NS_IS_INITIALIZED Daniel Walter
2016-09-21 9:55 ` [PATCH v2 33/46] mtd: nandsim: Relax page size restrictions Daniel Walter
2016-09-21 9:55 ` [PATCH v2 34/46] mtd: nandsim: Support bitflip and read error emulation in file backend Daniel Walter
2016-09-21 9:55 ` [PATCH v2 35/46] mtd: nandsim: Make NANDSIM_MAX_DEVICES part of uapi Daniel Walter
2016-09-21 9:55 ` [PATCH v2 36/46] mtd: nandsim: Cleanup constants Daniel Walter
2016-09-21 9:55 ` [PATCH v2 37/46] mtd: nandsim: Turn parts[] into a integer Daniel Walter
2016-09-21 9:56 ` [PATCH v2 38/46] mtd: nandsim: Expose partition creation logic to user space Daniel Walter
2016-09-21 9:56 ` [PATCH v2 39/46] mtd: nandsim: Rework init error paths Daniel Walter
2016-09-21 9:56 ` [PATCH v2 40/46] mtd: nandsim: Expose BBT, delays, etc.. to userspace Daniel Walter
2016-09-21 9:56 ` [PATCH v2 41/46] mtd: nandsim: Expose support for weakpages/blocks " Daniel Walter
2016-09-21 9:57 ` [PATCH v2 42/46] mtd: nandsim: Don't printk on ENOMEM Daniel Walter
2016-09-21 9:57 ` [PATCH v2 43/46] mtd: nandsim: Wire up NANDSIM_IOC_NEW_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 44/46] mtd: nandsim: Wire up NANDSIM_IOC_DESTROY_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 45/46] mtd: nandsim: Always answer all 8 bytes from NAND_CMD_READID Daniel Walter
2016-09-21 9:57 ` [PATCH v2 46/46] mtd/nandsim: Add ioctl for info Daniel Walter
2016-10-16 16:24 ` [PATCH v2 00/46] Nandsim facelift (part I of II) Boris Brezillon
2016-11-14 16:24 ` Richard Weinberger
2016-11-20 10:26 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e99cacb165395631be40e9f8994dc086327ce7e5.1474450296.git.dwalter@sigma-star.at \
--to=dwalter@sigma-star.at \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).