2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* linux/fs/ufs/namei.c
|
|
|
|
*
|
2006-06-25 16:47:22 +04:00
|
|
|
* Migration to usage of "page cache" on May 2006 by
|
|
|
|
* Evgeniy Dushistov <dushistov@mail.ru> based on ext2 code base.
|
|
|
|
*
|
2005-04-17 02:20:36 +04:00
|
|
|
* Copyright (C) 1998
|
|
|
|
* Daniel Pirkl <daniel.pirkl@email.cz>
|
|
|
|
* Charles University, Faculty of Mathematics and Physics
|
|
|
|
*
|
|
|
|
* from
|
|
|
|
*
|
|
|
|
* linux/fs/ext2/namei.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
|
|
* Remy Card (card@masi.ibp.fr)
|
|
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
|
|
*
|
|
|
|
* from
|
|
|
|
*
|
|
|
|
* linux/fs/minix/namei.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* Big-endian to little-endian byte-swapping/bitmaps by
|
|
|
|
* David S. Miller (davem@caip.rutgers.edu), 1995
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/fs.h>
|
2008-02-08 15:21:31 +03:00
|
|
|
|
|
|
|
#include "ufs_fs.h"
|
2007-10-17 10:26:51 +04:00
|
|
|
#include "ufs.h"
|
2005-04-17 02:20:36 +04:00
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
|
|
|
|
{
|
|
|
|
int err = ufs_add_link(dentry, inode);
|
|
|
|
if (!err) {
|
2014-09-27 05:17:52 +04:00
|
|
|
unlock_new_inode(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
d_instantiate(dentry, inode);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(inode);
|
2014-09-27 05:17:52 +04:00
|
|
|
unlock_new_inode(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
iput(inode);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-06-11 01:13:09 +04:00
|
|
|
static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, unsigned int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct inode * inode = NULL;
|
|
|
|
ino_t ino;
|
|
|
|
|
|
|
|
if (dentry->d_name.len > UFS_MAXNAMLEN)
|
|
|
|
return ERR_PTR(-ENAMETOOLONG);
|
|
|
|
|
2009-12-16 03:46:50 +03:00
|
|
|
ino = ufs_inode_by_name(dir, &dentry->d_name);
|
2011-07-17 18:07:34 +04:00
|
|
|
if (ino)
|
2008-02-07 11:15:48 +03:00
|
|
|
inode = ufs_iget(dir->i_sb, ino);
|
2011-07-17 18:07:34 +04:00
|
|
|
return d_splice_alias(inode, dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* By the time this is called, we already have created
|
|
|
|
* the directory cache entry for the new file, but it
|
|
|
|
* is so far negative - it has no inode.
|
|
|
|
*
|
|
|
|
* If the create succeeds, we fill in the inode information
|
|
|
|
* with d_instantiate().
|
|
|
|
*/
|
2011-07-26 09:42:34 +04:00
|
|
|
static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode,
|
2012-06-11 02:05:36 +04:00
|
|
|
bool excl)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:24 +04:00
|
|
|
struct inode *inode;
|
2010-03-03 17:05:06 +03:00
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
inode = ufs_new_inode(dir, mode);
|
2015-06-16 08:50:43 +03:00
|
|
|
if (IS_ERR(inode))
|
|
|
|
return PTR_ERR(inode);
|
2006-06-25 16:47:24 +04:00
|
|
|
|
2015-06-16 08:50:43 +03:00
|
|
|
inode->i_op = &ufs_file_inode_operations;
|
|
|
|
inode->i_fop = &ufs_file_operations;
|
|
|
|
inode->i_mapping->a_ops = &ufs_aops;
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
return ufs_add_nondir(dentry, inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2011-07-26 09:52:52 +04:00
|
|
|
static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!old_valid_dev(rdev))
|
|
|
|
return -EINVAL;
|
2010-03-03 17:05:06 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
inode = ufs_new_inode(dir, mode);
|
|
|
|
err = PTR_ERR(inode);
|
|
|
|
if (!IS_ERR(inode)) {
|
|
|
|
init_special_inode(inode, mode, rdev);
|
|
|
|
ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
err = ufs_add_nondir(dentry, inode);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ufs_symlink (struct inode * dir, struct dentry * dentry,
|
|
|
|
const char * symname)
|
|
|
|
{
|
|
|
|
struct super_block * sb = dir->i_sb;
|
2015-06-16 08:50:43 +03:00
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
unsigned l = strlen(symname)+1;
|
|
|
|
struct inode * inode;
|
|
|
|
|
|
|
|
if (l > sb->s_blocksize)
|
2015-06-16 08:50:43 +03:00
|
|
|
return -ENAMETOOLONG;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
inode = ufs_new_inode(dir, S_IFLNK | S_IRWXUGO);
|
|
|
|
err = PTR_ERR(inode);
|
|
|
|
if (IS_ERR(inode))
|
2015-06-16 08:50:43 +03:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (l > UFS_SB(sb)->s_uspi->s_maxsymlinklen) {
|
|
|
|
/* slow symlink */
|
2015-11-16 02:24:17 +03:00
|
|
|
inode->i_op = &page_symlink_inode_operations;
|
2015-11-17 09:07:57 +03:00
|
|
|
inode_nohighmem(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
inode->i_mapping->a_ops = &ufs_aops;
|
|
|
|
err = page_symlink(inode, symname, l);
|
|
|
|
if (err)
|
|
|
|
goto out_fail;
|
|
|
|
} else {
|
|
|
|
/* fast symlink */
|
2015-11-16 02:24:17 +03:00
|
|
|
inode->i_op = &simple_symlink_inode_operations;
|
2015-05-02 17:28:56 +03:00
|
|
|
inode->i_link = (char *)UFS_I(inode)->i_u1.i_symlink;
|
|
|
|
memcpy(inode->i_link, symname, l);
|
2005-04-17 02:20:36 +04:00
|
|
|
inode->i_size = l-1;
|
|
|
|
}
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
|
2015-06-16 08:50:43 +03:00
|
|
|
return ufs_add_nondir(dentry, inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
out_fail:
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(inode);
|
2014-09-27 05:17:52 +04:00
|
|
|
unlock_new_inode(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
iput(inode);
|
2015-06-16 08:50:43 +03:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ufs_link (struct dentry * old_dentry, struct inode * dir,
|
|
|
|
struct dentry *dentry)
|
|
|
|
{
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(old_dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
int error;
|
|
|
|
|
2016-09-14 17:48:05 +03:00
|
|
|
inode->i_ctime = current_time(inode);
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_inc_link_count(inode);
|
2010-10-23 19:11:40 +04:00
|
|
|
ihold(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2015-06-01 15:52:04 +03:00
|
|
|
error = ufs_add_link(dentry, inode);
|
|
|
|
if (error) {
|
|
|
|
inode_dec_link_count(inode);
|
|
|
|
iput(inode);
|
|
|
|
} else
|
|
|
|
d_instantiate(dentry, inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2011-07-26 09:41:39 +04:00
|
|
|
static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct inode * inode;
|
2012-02-06 21:45:27 +04:00
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2015-06-10 03:09:32 +03:00
|
|
|
inode_inc_link_count(dir);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
inode = ufs_new_inode(dir, S_IFDIR|mode);
|
2015-06-10 03:09:32 +03:00
|
|
|
err = PTR_ERR(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (IS_ERR(inode))
|
2015-06-10 03:09:32 +03:00
|
|
|
goto out_dir;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
inode->i_op = &ufs_dir_inode_operations;
|
|
|
|
inode->i_fop = &ufs_dir_operations;
|
2006-06-25 16:47:21 +04:00
|
|
|
inode->i_mapping->a_ops = &ufs_aops;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_inc_link_count(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
err = ufs_make_empty(inode, dir);
|
|
|
|
if (err)
|
|
|
|
goto out_fail;
|
|
|
|
|
|
|
|
err = ufs_add_link(dentry, inode);
|
|
|
|
if (err)
|
|
|
|
goto out_fail;
|
|
|
|
|
2015-06-02 12:26:34 +03:00
|
|
|
unlock_new_inode(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
d_instantiate(dentry, inode);
|
2015-06-16 08:50:43 +03:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
out_fail:
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(inode);
|
|
|
|
inode_dec_link_count(inode);
|
2014-09-27 05:17:52 +04:00
|
|
|
unlock_new_inode(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
iput (inode);
|
2015-06-10 03:09:32 +03:00
|
|
|
out_dir:
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(dir);
|
2015-06-16 08:50:43 +03:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
static int ufs_unlink(struct inode *dir, struct dentry *dentry)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode * inode = d_inode(dentry);
|
2006-06-25 16:47:22 +04:00
|
|
|
struct ufs_dir_entry *de;
|
|
|
|
struct page *page;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err = -ENOENT;
|
|
|
|
|
2009-12-16 03:46:50 +03:00
|
|
|
de = ufs_find_entry(dir, &dentry->d_name, &page);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!de)
|
|
|
|
goto out;
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
err = ufs_delete_entry(dir, de, page);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
inode->i_ctime = dir->i_ctime;
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
err = 0;
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
|
|
|
|
{
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode * inode = d_inode(dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
int err= -ENOTEMPTY;
|
|
|
|
|
|
|
|
if (ufs_empty_dir (inode)) {
|
|
|
|
err = ufs_unlink(dir, dentry);
|
|
|
|
if (!err) {
|
|
|
|
inode->i_size = 0;
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(inode);
|
|
|
|
inode_dec_link_count(dir);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
fs: support RENAME_NOREPLACE for local filesystems
This is trivial to do:
- add flags argument to foo_rename()
- check if flags doesn't have any other than RENAME_NOREPLACE
- assign foo_rename() to .rename2 instead of .rename
Filesystems converted:
affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@kernel.org>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@infradead.org>
2016-09-27 12:03:57 +03:00
|
|
|
struct inode *new_dir, struct dentry *new_dentry,
|
|
|
|
unsigned int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *old_inode = d_inode(old_dentry);
|
|
|
|
struct inode *new_inode = d_inode(new_dentry);
|
2006-06-25 16:47:22 +04:00
|
|
|
struct page *dir_page = NULL;
|
|
|
|
struct ufs_dir_entry * dir_de = NULL;
|
|
|
|
struct page *old_page;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct ufs_dir_entry *old_de;
|
|
|
|
int err = -ENOENT;
|
|
|
|
|
fs: support RENAME_NOREPLACE for local filesystems
This is trivial to do:
- add flags argument to foo_rename()
- check if flags doesn't have any other than RENAME_NOREPLACE
- assign foo_rename() to .rename2 instead of .rename
Filesystems converted:
affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@kernel.org>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@infradead.org>
2016-09-27 12:03:57 +03:00
|
|
|
if (flags & ~RENAME_NOREPLACE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-12-16 03:46:50 +03:00
|
|
|
old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!old_de)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (S_ISDIR(old_inode->i_mode)) {
|
|
|
|
err = -EIO;
|
2006-06-25 16:47:22 +04:00
|
|
|
dir_de = ufs_dotdot(old_inode, &dir_page);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!dir_de)
|
|
|
|
goto out_old;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (new_inode) {
|
2006-06-25 16:47:22 +04:00
|
|
|
struct page *new_page;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct ufs_dir_entry *new_de;
|
|
|
|
|
|
|
|
err = -ENOTEMPTY;
|
2006-06-25 16:47:22 +04:00
|
|
|
if (dir_de && !ufs_empty_dir(new_inode))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out_dir;
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
err = -ENOENT;
|
2009-12-16 03:46:50 +03:00
|
|
|
new_de = ufs_find_entry(new_dir, &new_dentry->d_name, &new_page);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!new_de)
|
|
|
|
goto out_dir;
|
2015-06-16 08:56:23 +03:00
|
|
|
ufs_set_link(new_dir, new_de, new_page, old_inode, 1);
|
2016-09-14 17:48:05 +03:00
|
|
|
new_inode->i_ctime = current_time(new_inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (dir_de)
|
2006-10-01 10:29:03 +04:00
|
|
|
drop_nlink(new_inode);
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(new_inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
|
|
|
err = ufs_add_link(new_dentry, old_inode);
|
2011-03-02 17:40:21 +03:00
|
|
|
if (err)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out_dir;
|
|
|
|
if (dir_de)
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_inc_link_count(new_dir);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
/*
|
|
|
|
* Like most other Unix systems, set the ctime for inodes on a
|
|
|
|
* rename.
|
|
|
|
*/
|
2016-09-14 17:48:05 +03:00
|
|
|
old_inode->i_ctime = current_time(old_inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
ufs_delete_entry(old_dir, old_de, old_page);
|
2011-03-02 17:40:21 +03:00
|
|
|
mark_inode_dirty(old_inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (dir_de) {
|
2015-06-16 08:56:23 +03:00
|
|
|
if (old_dir != new_dir)
|
|
|
|
ufs_set_link(old_inode, dir_de, dir_page, new_dir, 0);
|
|
|
|
else {
|
|
|
|
kunmap(dir_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
put_page(dir_page);
|
2015-06-16 08:56:23 +03:00
|
|
|
}
|
2006-03-23 14:00:53 +03:00
|
|
|
inode_dec_link_count(old_dir);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
out_dir:
|
2006-06-25 16:47:22 +04:00
|
|
|
if (dir_de) {
|
|
|
|
kunmap(dir_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
put_page(dir_page);
|
2006-06-25 16:47:22 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
out_old:
|
2006-06-25 16:47:22 +04:00
|
|
|
kunmap(old_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
put_page(old_page);
|
2005-04-17 02:20:36 +04:00
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-02-12 11:55:40 +03:00
|
|
|
const struct inode_operations ufs_dir_inode_operations = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.create = ufs_create,
|
|
|
|
.lookup = ufs_lookup,
|
|
|
|
.link = ufs_link,
|
|
|
|
.unlink = ufs_unlink,
|
|
|
|
.symlink = ufs_symlink,
|
|
|
|
.mkdir = ufs_mkdir,
|
|
|
|
.rmdir = ufs_rmdir,
|
|
|
|
.mknod = ufs_mknod,
|
|
|
|
.rename = ufs_rename,
|
|
|
|
};
|