diff options
author | Jan Kara <jack@suse.cz> | 2010-09-15 17:38:58 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2011-01-12 19:14:55 +0100 |
commit | f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab (patch) | |
tree | cbb47ae0d8aba9d8b3c44714b000156715cdf969 /include/linux/quotaops.h | |
parent | 4162cf64973df51fc885825bc9ca4d055891c49f (diff) | |
download | linux-stable-f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab.tar.gz linux-stable-f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab.tar.bz2 linux-stable-f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab.zip |
quota: Fix deadlock during path resolution
As Al Viro pointed out path resolution during Q_QUOTAON calls to quotactl
is prone to deadlocks. We hold s_umount semaphore for reading during the
path resolution and resolution itself may need to acquire the semaphore
for writing when e. g. autofs mountpoint is passed.
Solve the problem by performing the resolution before we get hold of the
superblock (and thus s_umount semaphore). The whole thing is complicated
by the fact that some filesystems (OCFS2) ignore the path argument. So to
distinguish between filesystem which want the path and which do not we
introduce new .quota_on_meta callback which does not get the path. OCFS2
then uses this callback instead of old .quota_on.
CC: Al Viro <viro@ZenIV.linux.org.uk>
CC: Christoph Hellwig <hch@lst.de>
CC: Ted Ts'o <tytso@mit.edu>
CC: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include/linux/quotaops.h')
-rw-r--r-- | include/linux/quotaops.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 223b14cd129c..eb354f6f26b3 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h @@ -76,11 +76,9 @@ int dquot_mark_dquot_dirty(struct dquot *dquot); int dquot_file_open(struct inode *inode, struct file *file); -int dquot_quota_on(struct super_block *sb, int type, int format_id, - char *path); int dquot_enable(struct inode *inode, int type, int format_id, unsigned int flags); -int dquot_quota_on_path(struct super_block *sb, int type, int format_id, +int dquot_quota_on(struct super_block *sb, int type, int format_id, struct path *path); int dquot_quota_on_mount(struct super_block *sb, char *qf_name, int format_id, int type); |