mirror of
git://sourceware.org/git/lvm2.git
synced 2025-02-28 05:57:49 +03:00
o Further changes to new file system interface
This commit is contained in:
steve
parent
05bebea511
commit
5971480f55
@ -70,14 +70,36 @@ static int dmfs_lv_link(struct dentry *old_dentry, struct inode *dir, struct den
|
||||
if (dentry->d_name[0] == '.')
|
||||
return -EPERM;
|
||||
|
||||
inode->i_ctime = CURRENT_TIME;
|
||||
if (old_dentry->d_name[0] == '.')
|
||||
return -EPERM;
|
||||
|
||||
inode->i_nlink++;
|
||||
atomic_inc(&inode->i_count);
|
||||
dget(dentry);
|
||||
d_instantiate(dentry, inode);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dentry *dmfs_lv_lookup(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
d_add(dentry, NULL);
|
||||
struct inode *inode = NULL;
|
||||
|
||||
if (dentry->d_name[0] == '.') {
|
||||
char *name = dentry->d_name.name;
|
||||
switch(dentry->d_name.len) {
|
||||
case 7:
|
||||
if (memcmp(".active", name, 7) == 0)
|
||||
inode = dmfs_create_active(dir, 0600);
|
||||
break;
|
||||
case 11:
|
||||
if (memcmp(".suspend_IO", name, 11) == 0)
|
||||
inode = dmfs_create_suspend(dir, 0600);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
d_add(dentry, inode);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -87,6 +109,86 @@ static int dmfs_lv_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
if (old_dir != new_dir)
|
||||
return -EPERM;
|
||||
|
||||
if (new_dentry->d_name[0] == '.')
|
||||
return -EPERM;
|
||||
|
||||
if (old_dentry->d_name[0] == '.')
|
||||
return -EPERM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Taken from dcache_readdir().
|
||||
* This version has a few tweeks to ensure that we always report the
|
||||
* virtual files and that we don't report them twice.
|
||||
*/
|
||||
static int dmfs_lv_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
||||
{
|
||||
int i;
|
||||
struct dentry *dentry = filp->f_dentry;
|
||||
|
||||
i = flip->f_pos;
|
||||
switch(i) {
|
||||
case 0:
|
||||
if (filldir(dirent, ".", 1, i, dentry->d_inode->i_ino, DT_DIR) < 0)
|
||||
break;
|
||||
i++;
|
||||
flip->f_pos++;
|
||||
/* fallthrough */
|
||||
case 1:
|
||||
if (filldir(dirent, "..", 2, i, dentry->d_parent->d_inode->i_ino, DT_DIR) < 0
|
||||
break;
|
||||
i++;
|
||||
filp->f_pos++;
|
||||
/* fallthrough */
|
||||
case 2:
|
||||
if (filldir(dirent, ".active", 7, i, 2, DT_REG) < 0)
|
||||
break;
|
||||
i++;
|
||||
filp->f_pos++;
|
||||
/* fallthrough */
|
||||
case 3:
|
||||
if (filldir(dirent, ".suspend_IO", 11, i, 3, DT_REG) < 0)
|
||||
break;
|
||||
i++;
|
||||
filp->f_pos++;
|
||||
/* fallthrough */
|
||||
default: {
|
||||
struct list_head *list;
|
||||
int j = i - 4;
|
||||
|
||||
spin_lock(&dcache_lock);
|
||||
list = dentry->d_subdirs.next;
|
||||
|
||||
for(;;) {
|
||||
if (list = &dentry->d_subdirs) {
|
||||
spin_unlock(&dcache_lock);
|
||||
return 0;
|
||||
}
|
||||
if (!j)
|
||||
break;
|
||||
j--;
|
||||
list = list->next;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
struct dentry *de = list_entry(list, struct dentry, d_child);
|
||||
if (!d_unhashed(de) && de->d_inode && de->d_inode->generic_ip != NULL) {
|
||||
spin_unlock(&dcache_lock);
|
||||
if (filldir(dirent, de->d_name.name, de->d_name.len, filp->f_pos, de->d_inode->i_ino, DT_REG) < 0)
|
||||
break;
|
||||
spin_lock(&dcache_lock);
|
||||
}
|
||||
filp->f_pos++;
|
||||
list = list->next;
|
||||
if (list != &dentry->d_subdirs)
|
||||
continue;
|
||||
spin_unlock(&dcache_lock);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -98,7 +200,7 @@ static int dmfs_lv_sync(struct file *file, struct dentry *dentry, int datasync)
|
||||
|
||||
static struct dmfs_lv_file_operations = {
|
||||
read: generic_read_dir,
|
||||
readdir: dcache_readdir,
|
||||
readdir: dmfs_lv_readdir,
|
||||
fsync: dmfs_lv_sync,
|
||||
};
|
||||
|
||||
|
||||
@ -41,6 +41,9 @@ static int dmfs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
||||
struct inode *inode;
|
||||
struct mapped_device *md;
|
||||
|
||||
if (dentry->d_name.len >= DM_NAME_LEN)
|
||||
return -EINVAL;
|
||||
|
||||
if (!is_identifier(name, dentry->d_name.len))
|
||||
return -EPERM;
|
||||
|
||||
@ -60,9 +63,15 @@ static int dmfs_root_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
||||
return PTR_ERR(inode);
|
||||
}
|
||||
|
||||
/*
|
||||
* if u.generic_ip is not NULL, then it indicates an inode which
|
||||
* represents a table. If it is NULL then the inode is a virtual
|
||||
* file and should be deleted along with the directory.
|
||||
*/
|
||||
static inline positive(struct dentry *dentry)
|
||||
{
|
||||
return dentry->d_inode && !d_unhashed(dentry);
|
||||
return dentry->d_inode && dentry->d_inode->u.generic_ip &&
|
||||
!d_unhashed(dentry);
|
||||
}
|
||||
|
||||
static int empty(struct dentry *dentry)
|
||||
@ -85,26 +94,52 @@ static int empty(struct dentry *dentry)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int dmfs_delete_virtual(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
struct list_head *list;
|
||||
struct dentry *de;
|
||||
int rv = 0;
|
||||
|
||||
while(1) {
|
||||
spin_lock(&dcache_lock);
|
||||
list = dentry->d_subdirs.next;
|
||||
if (list == &dentry->d_subdirs) {
|
||||
spin_unlock(&dcache_lock);
|
||||
break;
|
||||
}
|
||||
de = list_entry(list, struct dentry, d_child);
|
||||
if (de->d_inode && !d_unhashed(de)) {
|
||||
spin_unlock(&dcache_lock);
|
||||
if (de->d_inode->u.generic_ip)
|
||||
BUG();
|
||||
rv = de->d_inode->ops->unlink(dir, de);
|
||||
if (rv == 0) {
|
||||
d_delete(de);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
spin_unlock(&dcache_lock);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
static int dmfs_root_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
int ret = -ENOTEMPTY;
|
||||
|
||||
/*
|
||||
* FIXME: Checks need to be more complicated than this...
|
||||
* Need to take into account removing "virtual" files but must
|
||||
* not allow removal whilst tables are still existing. Also we
|
||||
* should check for the block device being closed.
|
||||
*/
|
||||
|
||||
if (empty(dentry)) {
|
||||
struct inode *inode = dentry->d_inode;
|
||||
|
||||
inode->i_nlink--;
|
||||
dm_remove(dentry->d_name.name);
|
||||
dput(dentry);
|
||||
ret = dmfs_delete_virtual(dir, dentry);
|
||||
if (ret == 0) {
|
||||
inode->i_nlink--;
|
||||
dput(dentry);
|
||||
}
|
||||
}
|
||||
|
||||
return retval;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct dentry *dmfs_root_lookup(struct inode *dir, struct dentry *dentry)
|
||||
|
||||
@ -22,30 +22,60 @@
|
||||
#include <linux/config.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
static ssize_t dmfs_table_read(struct file *file, char *buf, size_t size, loff_t *pos)
|
||||
static int dmfs_release(struct inode *inode, struct file *f)
|
||||
{
|
||||
down(&inode->i_sem);
|
||||
struct dm_table *table;
|
||||
|
||||
/* FIXME: we should lock the inode to
|
||||
prevent someone else opening it while
|
||||
we are parsing */
|
||||
|
||||
if (!(f->f_mode & S_IWUGO))
|
||||
return 0;
|
||||
|
||||
up(&inode->i_sem);
|
||||
}
|
||||
|
||||
static ssize_t dmfs_table_write(struct file *file, const char *buf, size_t size, loff_t *pos)
|
||||
static int dmfs_readpage(struct file *file, struct page *page)
|
||||
{
|
||||
down(&inode->i_sem);
|
||||
|
||||
up(&inode->i_sem);
|
||||
if (!PageUptodate(page)) {
|
||||
memset(kmap(page), 0, PAGE_CACHE_SIZE);
|
||||
kunmap(page);
|
||||
flush_dcache_page(page);
|
||||
SetPageUptodate(page);
|
||||
}
|
||||
UnlockPage(page);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dmfs_table_open(struct inode *inode, struct file *file)
|
||||
static int dmfs_writepage(struct page *page)
|
||||
{
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
SetPageDirty(page);
|
||||
UnlockPage(page);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (dentry->name[0] == '.')
|
||||
return -EPERM;
|
||||
static int dmfs_prepare_write(struct file *file, struct page *page,
|
||||
unsigned offset, unsigned to)
|
||||
{
|
||||
void *addr = kmap(page);
|
||||
if (!Page_Uptodate(page)) {
|
||||
memset(addr, 0, PAGE_CACHE_SIZE);
|
||||
flush_dcache_page(page);
|
||||
SetPageUptodate(page);
|
||||
}
|
||||
SetPageDirty(page);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (dentry->name.len == 6 && memcmp("ACTIVE", dentry->name.name, 6) == 0)
|
||||
return -EPERM;
|
||||
static int dmfs_commit_write(struct file *file, struct page *page,
|
||||
unsigned offset, unsigned to)
|
||||
{
|
||||
struct inode *inode = page->mapping->host;
|
||||
loff_t pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + to;
|
||||
|
||||
kunmap(page);
|
||||
if (pos > inode->i_size)
|
||||
inode->i_size = pos;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -54,18 +84,26 @@ static int dmfs_table_sync(struct file *file, struct dentry *dentry, int datasyn
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dm_table_address_space_operations = {
|
||||
readpage: dmfs_readpage,
|
||||
writepage: dmfs_writepage,
|
||||
prepare_write: dmfs_prepare_write,
|
||||
commit_write: dmfs_commit_write,
|
||||
};
|
||||
|
||||
static struct dm_table_file_operations = {
|
||||
/* llseek: generic_file_llseek, */
|
||||
read: dmfs_read,
|
||||
write: dmfs_write,
|
||||
open: dmfs_open,
|
||||
llseek: generic_file_llseek,
|
||||
read: generic_file_read,
|
||||
write: generic_file_write,
|
||||
mmap: generic_file_mmap,
|
||||
fsync: dmfs_table_sync,
|
||||
release: dmfs_release,
|
||||
};
|
||||
|
||||
static struct dmfs_table_inode_operations = {
|
||||
};
|
||||
|
||||
int dmfs_create_file(struct inode *dir, struct dentry *dentry, int mode)
|
||||
int dmfs_create_table(struct inode *dir, int mode)
|
||||
{
|
||||
struct inode *inode = new_inode(dir->i_sb);
|
||||
|
||||
@ -77,6 +115,7 @@ int dmfs_create_file(struct inode *dir, struct dentry *dentry, int mode)
|
||||
inode->i_blocks = 0;
|
||||
inode->i_rdev = NODEV;
|
||||
inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME;
|
||||
inode->i_mapping->a_ops = &dmfs_table_address_space_operations;
|
||||
inode->i_fop = &dmfs_table_file_operations;
|
||||
inode->i_op = &dmfs_table_inode_operations;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user