Commit ae36607b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'affs-for-5.5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull AFFS updates from David Sterba:
 "A minor bugfix and cleanup for AFFS"

* tag 'affs-for-5.5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  affs: fix a memory leak in affs_remount
  affs: Replace binary semaphores with mutexes
parents 97d0bf96 450c3d41
...@@ -43,8 +43,8 @@ struct affs_ext_key { ...@@ -43,8 +43,8 @@ struct affs_ext_key {
*/ */
struct affs_inode_info { struct affs_inode_info {
atomic_t i_opencnt; atomic_t i_opencnt;
struct semaphore i_link_lock; /* Protects internal inode access. */ struct mutex i_link_lock; /* Protects internal inode access. */
struct semaphore i_ext_lock; /* Protects internal inode access. */ struct mutex i_ext_lock; /* Protects internal inode access. */
#define i_hash_lock i_ext_lock #define i_hash_lock i_ext_lock
u32 i_blkcnt; /* block count */ u32 i_blkcnt; /* block count */
u32 i_extcnt; /* extended block count */ u32 i_extcnt; /* extended block count */
...@@ -293,30 +293,30 @@ affs_adjust_bitmapchecksum(struct buffer_head *bh, u32 val) ...@@ -293,30 +293,30 @@ affs_adjust_bitmapchecksum(struct buffer_head *bh, u32 val)
static inline void static inline void
affs_lock_link(struct inode *inode) affs_lock_link(struct inode *inode)
{ {
down(&AFFS_I(inode)->i_link_lock); mutex_lock(&AFFS_I(inode)->i_link_lock);
} }
static inline void static inline void
affs_unlock_link(struct inode *inode) affs_unlock_link(struct inode *inode)
{ {
up(&AFFS_I(inode)->i_link_lock); mutex_unlock(&AFFS_I(inode)->i_link_lock);
} }
static inline void static inline void
affs_lock_dir(struct inode *inode) affs_lock_dir(struct inode *inode)
{ {
down(&AFFS_I(inode)->i_hash_lock); mutex_lock_nested(&AFFS_I(inode)->i_hash_lock, SINGLE_DEPTH_NESTING);
} }
static inline void static inline void
affs_unlock_dir(struct inode *inode) affs_unlock_dir(struct inode *inode)
{ {
up(&AFFS_I(inode)->i_hash_lock); mutex_unlock(&AFFS_I(inode)->i_hash_lock);
} }
static inline void static inline void
affs_lock_ext(struct inode *inode) affs_lock_ext(struct inode *inode)
{ {
down(&AFFS_I(inode)->i_ext_lock); mutex_lock(&AFFS_I(inode)->i_ext_lock);
} }
static inline void static inline void
affs_unlock_ext(struct inode *inode) affs_unlock_ext(struct inode *inode)
{ {
up(&AFFS_I(inode)->i_ext_lock); mutex_unlock(&AFFS_I(inode)->i_ext_lock);
} }
...@@ -121,8 +121,8 @@ static void init_once(void *foo) ...@@ -121,8 +121,8 @@ static void init_once(void *foo)
{ {
struct affs_inode_info *ei = (struct affs_inode_info *) foo; struct affs_inode_info *ei = (struct affs_inode_info *) foo;
sema_init(&ei->i_link_lock, 1); mutex_init(&ei->i_link_lock);
sema_init(&ei->i_ext_lock, 1); mutex_init(&ei->i_ext_lock);
inode_init_once(&ei->vfs_inode); inode_init_once(&ei->vfs_inode);
} }
...@@ -561,14 +561,9 @@ affs_remount(struct super_block *sb, int *flags, char *data) ...@@ -561,14 +561,9 @@ affs_remount(struct super_block *sb, int *flags, char *data)
int root_block; int root_block;
unsigned long mount_flags; unsigned long mount_flags;
int res = 0; int res = 0;
char *new_opts;
char volume[32]; char volume[32];
char *prefix = NULL; char *prefix = NULL;
new_opts = kstrdup(data, GFP_KERNEL);
if (data && !new_opts)
return -ENOMEM;
pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data); pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data);
sync_filesystem(sb); sync_filesystem(sb);
...@@ -579,7 +574,6 @@ affs_remount(struct super_block *sb, int *flags, char *data) ...@@ -579,7 +574,6 @@ affs_remount(struct super_block *sb, int *flags, char *data)
&blocksize, &prefix, volume, &blocksize, &prefix, volume,
&mount_flags)) { &mount_flags)) {
kfree(prefix); kfree(prefix);
kfree(new_opts);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment