From: Richard Weinberger <richard@nod.at>
To: user-mode-linux-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, richard@nod.at
Subject: [PATCH 01/15] hostfs: hostfs_file_open: Switch to data locking model
Date: Mon, 16 Mar 2015 12:41:05 +0100 [thread overview]
Message-ID: <1426506079-26183-2-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1426506079-26183-1-git-send-email-richard@nod.at>
Instead of serializing hostfs_file_open() we can use
a per inode mutex to protect ->mode.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/hostfs/hostfs_kern.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index fd62cae..104d58d 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -24,6 +24,7 @@ struct hostfs_inode_info {
int fd;
fmode_t mode;
struct inode vfs_inode;
+ struct mutex open_mutex;
};
static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
@@ -225,6 +226,7 @@ static struct inode *hostfs_alloc_inode(struct super_block *sb)
hi->fd = -1;
hi->mode = 0;
inode_init_once(&hi->vfs_inode);
+ mutex_init(&hi->open_mutex);
return &hi->vfs_inode;
}
@@ -295,7 +297,6 @@ static int hostfs_readdir(struct file *file, struct dir_context *ctx)
static int hostfs_file_open(struct inode *ino, struct file *file)
{
- static DEFINE_MUTEX(open_mutex);
char *name;
fmode_t mode = 0;
int err;
@@ -324,15 +325,15 @@ retry:
if (fd < 0)
return fd;
- mutex_lock(&open_mutex);
+ mutex_lock(&HOSTFS_I(ino)->open_mutex);
/* somebody else had handled it first? */
if ((mode & HOSTFS_I(ino)->mode) == mode) {
- mutex_unlock(&open_mutex);
+ mutex_unlock(&HOSTFS_I(ino)->open_mutex);
return 0;
}
if ((mode | HOSTFS_I(ino)->mode) != mode) {
mode |= HOSTFS_I(ino)->mode;
- mutex_unlock(&open_mutex);
+ mutex_unlock(&HOSTFS_I(ino)->open_mutex);
close_file(&fd);
goto retry;
}
@@ -342,12 +343,12 @@ retry:
err = replace_file(fd, HOSTFS_I(ino)->fd);
close_file(&fd);
if (err < 0) {
- mutex_unlock(&open_mutex);
+ mutex_unlock(&HOSTFS_I(ino)->open_mutex);
return err;
}
}
HOSTFS_I(ino)->mode = mode;
- mutex_unlock(&open_mutex);
+ mutex_unlock(&HOSTFS_I(ino)->open_mutex);
return 0;
}
--
2.3.2
next prev parent reply other threads:[~2015-03-16 11:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 11:41 Hostfs updates Richard Weinberger
2015-03-16 11:41 ` Richard Weinberger [this message]
2015-03-16 11:41 ` [PATCH 02/15] hostfs: hostfs_file_open: Fix a fd leak in hostfs_file_open Richard Weinberger
2015-03-16 11:41 ` [PATCH 03/15] hostfs: Allow fsync on directories Richard Weinberger
2015-03-16 11:41 ` [PATCH 04/15] hostfs: Handle bogus st.mode Richard Weinberger
2015-03-16 11:41 ` [PATCH 05/15] hostfs: Make hostfs_readpage more readable Richard Weinberger
2015-03-16 11:41 ` [PATCH 06/15] hostfs: Add a BUG_ON to detect behavior changes of dentry_path_raw() Richard Weinberger
2015-03-16 11:41 ` [PATCH 07/15] hostfs: Remove open coded strcpy() Richard Weinberger
2015-03-16 12:03 ` [uml-devel] " Geert Uytterhoeven
2015-03-16 12:18 ` Richard Weinberger
2015-03-16 12:44 ` Geert Uytterhoeven
2015-03-16 11:41 ` [PATCH 08/15] hostfs: Use __getname() in follow_link Richard Weinberger
2015-03-16 11:41 ` [PATCH 09/15] hostfs: Report append flag in ->show_options() Richard Weinberger
2015-03-16 11:41 ` [PATCH 10/15] hostfs: Remove superfluous test in hostfs_open() Richard Weinberger
2015-03-16 11:41 ` [PATCH 11/15] hostfs: hostfs_open: Reset open flags upon each retry Richard Weinberger
2015-03-16 11:41 ` [PATCH 12/15] hostfs: Remove superfluous initializations in hostfs_open() Richard Weinberger
2015-03-16 11:41 ` [PATCH 13/15] hostfs: Set page flags in hostfs_readpage() correctly Richard Weinberger
2015-03-16 11:41 ` [PATCH 14/15] hostfs: Use page_offset() Richard Weinberger
2015-03-16 11:41 ` [PATCH 15/15] hostfs: No need to box and later unbox the file mode Richard Weinberger
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=1426506079-26183-2-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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
all inboxes | Powered by JetHome®