From: Eric Sandeen <sandeen@redhat.com>
To: ext4 development <linux-ext4@vger.kernel.org>
Cc: Anand Avati <avati@redhat.com>
Subject: [PATCH, RFC] ext4: add ioctl to force 32-bit hashes from indexed dirs
Date: Thu, 28 Mar 2013 11:14:06 -0500 [thread overview]
Message-ID: <51546C4E.9010903@redhat.com> (raw)
This adds a new ioctl, EXT4_IOC_32BITHASH, which allows a
userspace application to request 32-bit rather than 64-bit
hashes from readdir on an indexed / dx / htree directory.
Gluster had been relying on the top bits of the d_off being
free; there are some reports that filling all 64 bits breaks
Samba as well. The infrastructure to return 32-bit hashes
already exists; NFS can turn it on, and it's turned on for
32-bit processes as well. So it's just a matter of flipping
on the f_mode flag before readdir starts.
Care needs to be taken that we don't change the FMODE flag
after readdir has been started, so we make sure that
filp->private_data has not yet been set before we set the flag
(Thanks Zach!).
Pre-submission-fixes-by: Zach Brown <zab@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index d8cd1f0..5e3a316 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -39,7 +39,7 @@ static int ext4_dx_readdir(struct file *filp,
*
* Return 1 if it is a dx dir, 0 if not
*/
-static int is_dx_dir(struct inode *inode)
+int is_dx_dir(struct inode *inode)
{
struct super_block *sb = inode->i_sb;
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 3b83cd6..63e922e 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -614,6 +614,7 @@ enum {
/* note ioctl 10 reserved for an early version of the FIEMAP ioctl */
/* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */
#define EXT4_IOC_ALLOC_DA_BLKS _IO('f', 12)
+#define EXT4_IOC_32BITHASH _IOW('f', 13, long)
#define EXT4_IOC_MOVE_EXT _IOWR('f', 15, struct move_extent)
#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)
@@ -1953,6 +1954,7 @@ extern unsigned ext4_num_overhead_clusters(struct super_block *sb,
ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
/* dir.c */
+extern int is_dx_dir(struct inode *inode);
extern int __ext4_check_dir_entry(const char *, unsigned int, struct inode *,
struct file *,
struct ext4_dir_entry_2 *,
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 721f4d3..f226373 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -356,7 +356,41 @@ group_add_out:
mnt_drop_write_file(filp);
return err;
}
+ case EXT4_IOC_32BITHASH: {
+ __u32 hash32bits;
+ int err = 0;
+ if (get_user(hash32bits, (int __user *) arg))
+ return -EFAULT;
+
+ /* Serialize with readdir */
+ if ((err = mutex_lock_killable(&inode->i_mutex)))
+ return err;
+
+ /* protect f_mode */
+ spin_lock(&filp->f_lock);
+
+ /* Only valid for htree directories */
+ if (!S_ISDIR(inode->i_mode) || !is_dx_dir(inode)) {
+ err = -EINVAL;
+ goto out_32bithash;
+ }
+
+ /* Have we already started readir on this dx dir? */
+ if (filp->private_data) {
+ err = -EINVAL;
+ goto out_32bithash;
+ }
+
+ if (hash32bits)
+ filp->f_mode |= FMODE_32BITHASH;
+ else
+ filp->f_mode &= ~FMODE_32BITHASH;
+out_32bithash:
+ spin_unlock(&filp->f_lock);
+ mutex_unlock(&inode->i_mutex);
+ return err;
+ }
case EXT4_IOC_RESIZE_FS: {
ext4_fsblk_t n_blocks_count;
struct super_block *sb = inode->i_sb;
next reply other threads:[~2013-03-28 16:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 16:14 Eric Sandeen [this message]
2013-03-28 17:37 ` [PATCH, RFC] ext4: add ioctl to force 32-bit hashes from indexed dirs Bernd Schubert
2013-03-28 20:25 ` Eric Sandeen
2013-03-28 20:39 ` [PATCH, RFC V2] " Eric Sandeen
2013-04-01 15:35 ` [PATCH, RFC V3] " Eric Sandeen
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=51546C4E.9010903@redhat.com \
--to=sandeen@redhat.com \
--cc=avati@redhat.com \
--cc=linux-ext4@vger.kernel.org \
/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).