2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* linux/fs/ufs/ufs_dir.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1996
|
|
|
|
* Adrian Rodriguez (adrian@franklins-tower.rutgers.edu)
|
|
|
|
* Laboratory for Computer Science Research Computing Facility
|
|
|
|
* Rutgers, The State University of New Jersey
|
|
|
|
*
|
|
|
|
* swab support by Francois-Rene Rideau <fare@tunes.org> 19970406
|
|
|
|
*
|
|
|
|
* 4.4BSD (FreeBSD) support added on February 1st 1998 by
|
|
|
|
* Niels Kristian Bech Jensen <nkbj@image.dk> partially based
|
|
|
|
* on code by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>.
|
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
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/fs.h>
|
2007-10-16 12:25:19 +04:00
|
|
|
#include <linux/swap.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
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 "swab.h"
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE! unlike strncmp, ufs_match returns 1 for success, 0 for failure.
|
|
|
|
*
|
|
|
|
* len <= UFS_MAXNAMLEN and de != NULL are guaranteed by caller.
|
|
|
|
*/
|
|
|
|
static inline int ufs_match(struct super_block *sb, int len,
|
2010-02-01 04:49:54 +03:00
|
|
|
const unsigned char *name, struct ufs_dir_entry *de)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
if (len != ufs_get_de_namlen(sb, de))
|
|
|
|
return 0;
|
|
|
|
if (!de->d_ino)
|
|
|
|
return 0;
|
|
|
|
return !memcmp(name, de->d_name, len);
|
|
|
|
}
|
|
|
|
|
2007-10-16 12:25:19 +04:00
|
|
|
static int ufs_commit_chunk(struct page *page, loff_t pos, unsigned len)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-10-16 12:25:19 +04:00
|
|
|
struct address_space *mapping = page->mapping;
|
|
|
|
struct inode *dir = mapping->host;
|
2006-06-25 16:47:22 +04:00
|
|
|
int err = 0;
|
2007-10-16 12:25:19 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
dir->i_version++;
|
2007-10-16 12:25:19 +04:00
|
|
|
block_write_end(NULL, mapping, pos, len, len, page, NULL);
|
|
|
|
if (pos+len > dir->i_size) {
|
|
|
|
i_size_write(dir, pos+len);
|
|
|
|
mark_inode_dirty(dir);
|
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
if (IS_DIRSYNC(dir))
|
|
|
|
err = write_one_page(page, 1);
|
|
|
|
else
|
|
|
|
unlock_page(page);
|
|
|
|
return err;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
static inline void ufs_put_page(struct page *page)
|
|
|
|
{
|
|
|
|
kunmap(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(page);
|
2006-06-25 16:47:22 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-01 04:49:54 +03:00
|
|
|
ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr)
|
2006-06-25 16:47:22 +04:00
|
|
|
{
|
|
|
|
ino_t res = 0;
|
|
|
|
struct ufs_dir_entry *de;
|
|
|
|
struct page *page;
|
|
|
|
|
2009-12-16 03:46:50 +03:00
|
|
|
de = ufs_find_entry(dir, qstr, &page);
|
2006-06-25 16:47:22 +04:00
|
|
|
if (de) {
|
|
|
|
res = fs32_to_cpu(dir->i_sb, de->d_ino);
|
|
|
|
ufs_put_page(page);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
return res;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
/* Releases the page */
|
|
|
|
void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
|
2015-06-16 08:56:23 +03:00
|
|
|
struct page *page, struct inode *inode,
|
|
|
|
bool update_times)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-10-16 12:25:19 +04:00
|
|
|
loff_t pos = page_offset(page) +
|
|
|
|
(char *) de - (char *) page_address(page);
|
|
|
|
unsigned len = fs16_to_cpu(dir->i_sb, de->d_reclen);
|
2006-06-25 16:47:22 +04:00
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
lock_page(page);
|
2010-06-04 13:29:56 +04:00
|
|
|
err = ufs_prepare_chunk(page, pos, len);
|
2006-06-25 16:47:22 +04:00
|
|
|
BUG_ON(err);
|
2007-10-16 12:25:19 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
de->d_ino = cpu_to_fs32(dir->i_sb, inode->i_ino);
|
|
|
|
ufs_set_de_type(dir->i_sb, de, inode->i_mode);
|
2007-10-16 12:25:19 +04:00
|
|
|
|
|
|
|
err = ufs_commit_chunk(page, pos, len);
|
2006-06-25 16:47:22 +04:00
|
|
|
ufs_put_page(page);
|
2015-06-16 08:56:23 +03:00
|
|
|
if (update_times)
|
2016-09-14 17:48:05 +03:00
|
|
|
dir->i_mtime = dir->i_ctime = current_time(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
mark_inode_dirty(dir);
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
2016-04-22 22:06:44 +03:00
|
|
|
static bool ufs_check_page(struct page *page)
|
2006-06-25 16:47:22 +04:00
|
|
|
{
|
|
|
|
struct inode *dir = page->mapping->host;
|
|
|
|
struct super_block *sb = dir->i_sb;
|
|
|
|
char *kaddr = page_address(page);
|
|
|
|
unsigned offs, rec_len;
|
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
|
|
|
unsigned limit = PAGE_SIZE;
|
2007-02-09 01:20:25 +03:00
|
|
|
const unsigned chunk_mask = UFS_SB(sb)->s_uspi->s_dirblksize - 1;
|
2006-06-25 16:47:22 +04:00
|
|
|
struct ufs_dir_entry *p;
|
|
|
|
char *error;
|
|
|
|
|
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
|
|
|
if ((dir->i_size >> PAGE_SHIFT) == page->index) {
|
|
|
|
limit = dir->i_size & ~PAGE_MASK;
|
2007-02-09 01:20:25 +03:00
|
|
|
if (limit & chunk_mask)
|
2006-06-25 16:47:22 +04:00
|
|
|
goto Ebadsize;
|
|
|
|
if (!limit)
|
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
for (offs = 0; offs <= limit - UFS_DIR_REC_LEN(1); offs += rec_len) {
|
|
|
|
p = (struct ufs_dir_entry *)(kaddr + offs);
|
|
|
|
rec_len = fs16_to_cpu(sb, p->d_reclen);
|
|
|
|
|
|
|
|
if (rec_len < UFS_DIR_REC_LEN(1))
|
|
|
|
goto Eshort;
|
|
|
|
if (rec_len & 3)
|
|
|
|
goto Ealign;
|
|
|
|
if (rec_len < UFS_DIR_REC_LEN(ufs_get_de_namlen(sb, p)))
|
|
|
|
goto Enamelen;
|
2007-02-09 01:20:25 +03:00
|
|
|
if (((offs + rec_len - 1) ^ offs) & ~chunk_mask)
|
2006-06-25 16:47:22 +04:00
|
|
|
goto Espan;
|
|
|
|
if (fs32_to_cpu(sb, p->d_ino) > (UFS_SB(sb)->s_uspi->s_ipg *
|
|
|
|
UFS_SB(sb)->s_uspi->s_ncg))
|
|
|
|
goto Einumber;
|
|
|
|
}
|
|
|
|
if (offs != limit)
|
|
|
|
goto Eend;
|
|
|
|
out:
|
|
|
|
SetPageChecked(page);
|
2016-04-22 22:06:44 +03:00
|
|
|
return true;
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
/* Too bad, we had an error */
|
|
|
|
|
|
|
|
Ebadsize:
|
|
|
|
ufs_error(sb, "ufs_check_page",
|
|
|
|
"size of directory #%lu is not a multiple of chunk size",
|
|
|
|
dir->i_ino
|
|
|
|
);
|
|
|
|
goto fail;
|
|
|
|
Eshort:
|
|
|
|
error = "rec_len is smaller than minimal";
|
|
|
|
goto bad_entry;
|
|
|
|
Ealign:
|
|
|
|
error = "unaligned directory entry";
|
|
|
|
goto bad_entry;
|
|
|
|
Enamelen:
|
|
|
|
error = "rec_len is too small for name_len";
|
|
|
|
goto bad_entry;
|
|
|
|
Espan:
|
|
|
|
error = "directory entry across blocks";
|
|
|
|
goto bad_entry;
|
|
|
|
Einumber:
|
|
|
|
error = "inode out of bounds";
|
|
|
|
bad_entry:
|
|
|
|
ufs_error (sb, "ufs_check_page", "bad entry in directory #%lu: %s - "
|
|
|
|
"offset=%lu, rec_len=%d, name_len=%d",
|
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
|
|
|
dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs,
|
2006-06-25 16:47:22 +04:00
|
|
|
rec_len, ufs_get_de_namlen(sb, p));
|
|
|
|
goto fail;
|
|
|
|
Eend:
|
|
|
|
p = (struct ufs_dir_entry *)(kaddr + offs);
|
2008-04-28 13:16:17 +04:00
|
|
|
ufs_error(sb, __func__,
|
2006-06-25 16:47:22 +04:00
|
|
|
"entry in directory #%lu spans the page boundary"
|
|
|
|
"offset=%lu",
|
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
|
|
|
dir->i_ino, (page->index<<PAGE_SHIFT)+offs);
|
2006-06-25 16:47:22 +04:00
|
|
|
fail:
|
|
|
|
SetPageError(page);
|
2016-04-22 22:06:44 +03:00
|
|
|
return false;
|
2006-06-25 16:47:22 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
static struct page *ufs_get_page(struct inode *dir, unsigned long n)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = dir->i_mapping;
|
2007-05-07 01:49:04 +04:00
|
|
|
struct page *page = read_mapping_page(mapping, n, NULL);
|
2006-06-25 16:47:22 +04:00
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
kmap(page);
|
2016-04-22 22:06:44 +03:00
|
|
|
if (unlikely(!PageChecked(page))) {
|
|
|
|
if (PageError(page) || !ufs_check_page(page))
|
|
|
|
goto fail;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
return page;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
fail:
|
|
|
|
ufs_put_page(page);
|
|
|
|
return ERR_PTR(-EIO);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
/*
|
|
|
|
* Return the offset into page `page_nr' of the last valid
|
|
|
|
* byte in that page, plus one.
|
|
|
|
*/
|
|
|
|
static unsigned
|
|
|
|
ufs_last_byte(struct inode *inode, unsigned long page_nr)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned last_byte = inode->i_size;
|
|
|
|
|
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
|
|
|
last_byte -= page_nr << PAGE_SHIFT;
|
|
|
|
if (last_byte > PAGE_SIZE)
|
|
|
|
last_byte = PAGE_SIZE;
|
2006-06-25 16:47:22 +04:00
|
|
|
return last_byte;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
static inline struct ufs_dir_entry *
|
|
|
|
ufs_next_entry(struct super_block *sb, struct ufs_dir_entry *p)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
return (struct ufs_dir_entry *)((char *)p +
|
|
|
|
fs16_to_cpu(sb, p->d_reclen));
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
struct page *page = ufs_get_page(dir, 0);
|
|
|
|
struct ufs_dir_entry *de = NULL;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
de = ufs_next_entry(dir->i_sb,
|
|
|
|
(struct ufs_dir_entry *)page_address(page));
|
|
|
|
*p = page;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
return de;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
/*
|
|
|
|
* ufs_find_entry()
|
|
|
|
*
|
|
|
|
* finds an entry in the specified directory with the wanted name. It
|
|
|
|
* returns the page in which the entry was found, and the entry itself
|
|
|
|
* (as a parameter - res_dir). Page is returned mapped and unlocked.
|
|
|
|
* Entry is guaranteed to be valid.
|
|
|
|
*/
|
2010-02-01 04:49:54 +03:00
|
|
|
struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
|
2006-06-25 16:47:22 +04:00
|
|
|
struct page **res_page)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
struct super_block *sb = dir->i_sb;
|
2010-02-01 04:49:54 +03:00
|
|
|
const unsigned char *name = qstr->name;
|
2009-12-16 03:46:50 +03:00
|
|
|
int namelen = qstr->len;
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned reclen = UFS_DIR_REC_LEN(namelen);
|
|
|
|
unsigned long start, n;
|
2015-05-24 18:19:43 +03:00
|
|
|
unsigned long npages = dir_pages(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
struct page *page = NULL;
|
2006-06-25 16:47:25 +04:00
|
|
|
struct ufs_inode_info *ui = UFS_I(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
struct ufs_dir_entry *de;
|
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("ENTER, dir_ino %lu, name %s, namlen %u\n", dir->i_ino, name, namelen);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
if (npages == 0 || namelen > UFS_MAXNAMLEN)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* OFFSET_CACHE */
|
|
|
|
*res_page = NULL;
|
|
|
|
|
2006-06-25 16:47:25 +04:00
|
|
|
start = ui->i_dir_start_lookup;
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
if (start >= npages)
|
|
|
|
start = 0;
|
|
|
|
n = start;
|
|
|
|
do {
|
|
|
|
char *kaddr;
|
|
|
|
page = ufs_get_page(dir, n);
|
|
|
|
if (!IS_ERR(page)) {
|
|
|
|
kaddr = page_address(page);
|
|
|
|
de = (struct ufs_dir_entry *) kaddr;
|
|
|
|
kaddr += ufs_last_byte(dir, n) - reclen;
|
|
|
|
while ((char *) de <= kaddr) {
|
|
|
|
if (ufs_match(sb, namelen, name, de))
|
|
|
|
goto found;
|
|
|
|
de = ufs_next_entry(sb, de);
|
|
|
|
}
|
|
|
|
ufs_put_page(page);
|
|
|
|
}
|
|
|
|
if (++n >= npages)
|
|
|
|
n = 0;
|
|
|
|
} while (n != start);
|
|
|
|
out:
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
found:
|
|
|
|
*res_page = page;
|
2006-06-25 16:47:25 +04:00
|
|
|
ui->i_dir_start_lookup = n;
|
2006-06-25 16:47:22 +04:00
|
|
|
return de;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-06-25 16:47:22 +04:00
|
|
|
* Parent is locked.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
int ufs_add_link(struct dentry *dentry, struct inode *inode)
|
|
|
|
{
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *dir = d_inode(dentry->d_parent);
|
2010-02-01 04:49:54 +03:00
|
|
|
const unsigned char *name = dentry->d_name.name;
|
2005-04-17 02:20:36 +04:00
|
|
|
int namelen = dentry->d_name.len;
|
2006-06-25 16:47:22 +04:00
|
|
|
struct super_block *sb = dir->i_sb;
|
|
|
|
unsigned reclen = UFS_DIR_REC_LEN(namelen);
|
2007-02-09 01:20:25 +03:00
|
|
|
const unsigned int chunk_size = UFS_SB(sb)->s_uspi->s_dirblksize;
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned short rec_len, name_len;
|
|
|
|
struct page *page = NULL;
|
|
|
|
struct ufs_dir_entry *de;
|
2015-05-24 18:19:43 +03:00
|
|
|
unsigned long npages = dir_pages(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned long n;
|
|
|
|
char *kaddr;
|
2007-10-16 12:25:19 +04:00
|
|
|
loff_t pos;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("ENTER, name %s, namelen %u\n", name, namelen);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We take care of directory expansion in the same loop.
|
|
|
|
* This code plays outside i_size, so it locks the page
|
|
|
|
* to protect that region.
|
|
|
|
*/
|
|
|
|
for (n = 0; n <= npages; n++) {
|
|
|
|
char *dir_end;
|
|
|
|
|
|
|
|
page = ufs_get_page(dir, n);
|
|
|
|
err = PTR_ERR(page);
|
|
|
|
if (IS_ERR(page))
|
|
|
|
goto out;
|
|
|
|
lock_page(page);
|
|
|
|
kaddr = page_address(page);
|
|
|
|
dir_end = kaddr + ufs_last_byte(dir, n);
|
|
|
|
de = (struct ufs_dir_entry *)kaddr;
|
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
|
|
|
kaddr += PAGE_SIZE - reclen;
|
2006-06-25 16:47:22 +04:00
|
|
|
while ((char *)de <= kaddr) {
|
|
|
|
if ((char *)de == dir_end) {
|
|
|
|
/* We hit i_size */
|
|
|
|
name_len = 0;
|
2007-02-09 01:20:25 +03:00
|
|
|
rec_len = chunk_size;
|
|
|
|
de->d_reclen = cpu_to_fs16(sb, chunk_size);
|
2006-06-25 16:47:22 +04:00
|
|
|
de->d_ino = 0;
|
|
|
|
goto got_it;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
if (de->d_reclen == 0) {
|
2008-04-28 13:16:17 +04:00
|
|
|
ufs_error(dir->i_sb, __func__,
|
2006-06-25 16:47:22 +04:00
|
|
|
"zero-length directory entry");
|
|
|
|
err = -EIO;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
err = -EEXIST;
|
|
|
|
if (ufs_match(sb, namelen, name, de))
|
|
|
|
goto out_unlock;
|
|
|
|
name_len = UFS_DIR_REC_LEN(ufs_get_de_namlen(sb, de));
|
|
|
|
rec_len = fs16_to_cpu(sb, de->d_reclen);
|
|
|
|
if (!de->d_ino && rec_len >= reclen)
|
|
|
|
goto got_it;
|
|
|
|
if (rec_len >= name_len + reclen)
|
|
|
|
goto got_it;
|
|
|
|
de = (struct ufs_dir_entry *) ((char *) de + rec_len);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
unlock_page(page);
|
|
|
|
ufs_put_page(page);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
BUG();
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
got_it:
|
2007-10-16 12:25:19 +04:00
|
|
|
pos = page_offset(page) +
|
|
|
|
(char*)de - (char*)page_address(page);
|
2010-06-04 13:29:56 +04:00
|
|
|
err = ufs_prepare_chunk(page, pos, rec_len);
|
2006-06-25 16:47:22 +04:00
|
|
|
if (err)
|
|
|
|
goto out_unlock;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (de->d_ino) {
|
2006-06-25 16:47:22 +04:00
|
|
|
struct ufs_dir_entry *de1 =
|
|
|
|
(struct ufs_dir_entry *) ((char *) de + name_len);
|
|
|
|
de1->d_reclen = cpu_to_fs16(sb, rec_len - name_len);
|
|
|
|
de->d_reclen = cpu_to_fs16(sb, name_len);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
de = de1;
|
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
ufs_set_de_namlen(sb, de, namelen);
|
2006-06-25 16:47:22 +04:00
|
|
|
memcpy(de->d_name, name, namelen + 1);
|
2005-04-17 02:20:36 +04:00
|
|
|
de->d_ino = cpu_to_fs32(sb, inode->i_ino);
|
|
|
|
ufs_set_de_type(sb, de, inode->i_mode);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2007-10-16 12:25:19 +04:00
|
|
|
err = ufs_commit_chunk(page, pos, rec_len);
|
2016-09-14 17:48:05 +03:00
|
|
|
dir->i_mtime = dir->i_ctime = current_time(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
mark_inode_dirty(dir);
|
2006-06-25 16:47:22 +04:00
|
|
|
/* OFFSET_CACHE */
|
|
|
|
out_put:
|
|
|
|
ufs_put_page(page);
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
out_unlock:
|
|
|
|
unlock_page(page);
|
|
|
|
goto out_put;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned
|
|
|
|
ufs_validate_entry(struct super_block *sb, char *base,
|
|
|
|
unsigned offset, unsigned mask)
|
|
|
|
{
|
|
|
|
struct ufs_dir_entry *de = (struct ufs_dir_entry*)(base + offset);
|
|
|
|
struct ufs_dir_entry *p = (struct ufs_dir_entry*)(base + (offset&mask));
|
2016-05-28 04:22:04 +03:00
|
|
|
while ((char*)p < (char*)de)
|
2006-06-25 16:47:22 +04:00
|
|
|
p = ufs_next_entry(sb, p);
|
|
|
|
return (char *)p - base;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is blatantly stolen from ext2fs
|
|
|
|
*/
|
|
|
|
static int
|
2013-05-16 02:51:49 +04:00
|
|
|
ufs_readdir(struct file *file, struct dir_context *ctx)
|
2006-06-25 16:47:22 +04:00
|
|
|
{
|
2013-05-16 02:51:49 +04:00
|
|
|
loff_t pos = ctx->pos;
|
|
|
|
struct inode *inode = file_inode(file);
|
2006-06-25 16:47:22 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
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
|
|
|
unsigned int offset = pos & ~PAGE_MASK;
|
|
|
|
unsigned long n = pos >> PAGE_SHIFT;
|
2015-05-24 18:19:43 +03:00
|
|
|
unsigned long npages = dir_pages(inode);
|
2007-02-09 01:20:25 +03:00
|
|
|
unsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);
|
2013-05-16 02:51:49 +04:00
|
|
|
int need_revalidate = file->f_version != inode->i_version;
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned flags = UFS_SB(sb)->s_flags;
|
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("BEGIN\n");
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
if (pos > inode->i_size - UFS_DIR_REC_LEN(1))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for ( ; n < npages; n++, offset = 0) {
|
|
|
|
char *kaddr, *limit;
|
|
|
|
struct ufs_dir_entry *de;
|
|
|
|
|
|
|
|
struct page *page = ufs_get_page(inode, n);
|
|
|
|
|
|
|
|
if (IS_ERR(page)) {
|
2008-04-28 13:16:17 +04:00
|
|
|
ufs_error(sb, __func__,
|
2006-06-25 16:47:22 +04:00
|
|
|
"bad page in #%lu",
|
|
|
|
inode->i_ino);
|
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
|
|
|
ctx->pos += PAGE_SIZE - offset;
|
2006-06-25 16:47:22 +04:00
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
kaddr = page_address(page);
|
|
|
|
if (unlikely(need_revalidate)) {
|
|
|
|
if (offset) {
|
|
|
|
offset = ufs_validate_entry(sb, kaddr, offset, chunk_mask);
|
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
|
|
|
ctx->pos = (n<<PAGE_SHIFT) + offset;
|
2006-06-25 16:47:22 +04:00
|
|
|
}
|
2013-05-16 02:51:49 +04:00
|
|
|
file->f_version = inode->i_version;
|
2006-06-25 16:47:22 +04:00
|
|
|
need_revalidate = 0;
|
|
|
|
}
|
|
|
|
de = (struct ufs_dir_entry *)(kaddr+offset);
|
|
|
|
limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1);
|
|
|
|
for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) {
|
|
|
|
if (de->d_ino) {
|
|
|
|
unsigned char d_type = DT_UNKNOWN;
|
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("filldir(%s,%u)\n", de->d_name,
|
|
|
|
fs32_to_cpu(sb, de->d_ino));
|
|
|
|
UFSD("namlen %u\n", ufs_get_de_namlen(sb, de));
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
if ((flags & UFS_DE_MASK) == UFS_DE_44BSD)
|
|
|
|
d_type = de->d_u.d_44.d_type;
|
|
|
|
|
2013-05-16 02:51:49 +04:00
|
|
|
if (!dir_emit(ctx, de->d_name,
|
2006-06-25 16:47:22 +04:00
|
|
|
ufs_get_de_namlen(sb, de),
|
2013-05-16 02:51:49 +04:00
|
|
|
fs32_to_cpu(sb, de->d_ino),
|
|
|
|
d_type)) {
|
2006-06-25 16:47:22 +04:00
|
|
|
ufs_put_page(page);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2013-05-16 02:51:49 +04:00
|
|
|
ctx->pos += fs16_to_cpu(sb, de->d_reclen);
|
2006-06-25 16:47:22 +04:00
|
|
|
}
|
|
|
|
ufs_put_page(page);
|
|
|
|
}
|
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
|
|
|
/*
|
|
|
|
* ufs_delete_entry deletes a directory entry by merging it with the
|
|
|
|
* previous entry.
|
|
|
|
*/
|
2006-06-25 16:47:22 +04:00
|
|
|
int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
|
|
|
|
struct page * page)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
char *kaddr = page_address(page);
|
2007-02-09 01:20:25 +03:00
|
|
|
unsigned from = ((char*)dir - kaddr) & ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);
|
2006-06-25 16:47:22 +04:00
|
|
|
unsigned to = ((char*)dir - kaddr) + fs16_to_cpu(sb, dir->d_reclen);
|
2007-10-16 12:25:19 +04:00
|
|
|
loff_t pos;
|
2006-06-25 16:47:22 +04:00
|
|
|
struct ufs_dir_entry *pde = NULL;
|
|
|
|
struct ufs_dir_entry *de = (struct ufs_dir_entry *) (kaddr + from);
|
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("ENTER\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("ino %u, reclen %u, namlen %u, name %s\n",
|
2006-06-25 16:47:22 +04:00
|
|
|
fs32_to_cpu(sb, de->d_ino),
|
|
|
|
fs16_to_cpu(sb, de->d_reclen),
|
2006-06-25 16:47:24 +04:00
|
|
|
ufs_get_de_namlen(sb, de), de->d_name);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
while ((char*)de < (char*)dir) {
|
|
|
|
if (de->d_reclen == 0) {
|
2008-04-28 13:16:17 +04:00
|
|
|
ufs_error(inode->i_sb, __func__,
|
2006-06-25 16:47:22 +04:00
|
|
|
"zero-length directory entry");
|
|
|
|
err = -EIO;
|
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
pde = de;
|
|
|
|
de = ufs_next_entry(sb, de);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
if (pde)
|
|
|
|
from = (char*)pde - (char*)page_address(page);
|
2007-10-16 12:25:19 +04:00
|
|
|
|
|
|
|
pos = page_offset(page) + from;
|
2006-06-25 16:47:22 +04:00
|
|
|
lock_page(page);
|
2010-06-04 13:29:56 +04:00
|
|
|
err = ufs_prepare_chunk(page, pos, to - from);
|
2006-06-25 16:47:22 +04:00
|
|
|
BUG_ON(err);
|
|
|
|
if (pde)
|
2007-10-16 12:25:19 +04:00
|
|
|
pde->d_reclen = cpu_to_fs16(sb, to - from);
|
2006-06-25 16:47:22 +04:00
|
|
|
dir->d_ino = 0;
|
2007-10-16 12:25:19 +04:00
|
|
|
err = ufs_commit_chunk(page, pos, to - from);
|
2016-09-14 17:48:05 +03:00
|
|
|
inode->i_ctime = inode->i_mtime = current_time(inode);
|
2006-06-25 16:47:22 +04:00
|
|
|
mark_inode_dirty(inode);
|
|
|
|
out:
|
|
|
|
ufs_put_page(page);
|
2006-06-25 16:47:24 +04:00
|
|
|
UFSD("EXIT\n");
|
2006-06-25 16:47:22 +04:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
int ufs_make_empty(struct inode * inode, struct inode *dir)
|
|
|
|
{
|
|
|
|
struct super_block * sb = dir->i_sb;
|
2006-06-25 16:47:22 +04:00
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
struct page *page = grab_cache_page(mapping, 0);
|
2007-02-09 01:20:25 +03:00
|
|
|
const unsigned int chunk_size = UFS_SB(sb)->s_uspi->s_dirblksize;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct ufs_dir_entry * de;
|
2006-06-25 16:47:22 +04:00
|
|
|
char *base;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
2006-06-25 16:47:22 +04:00
|
|
|
if (!page)
|
|
|
|
return -ENOMEM;
|
2007-10-16 12:25:19 +04:00
|
|
|
|
2010-06-04 13:29:56 +04:00
|
|
|
err = ufs_prepare_chunk(page, 0, chunk_size);
|
2006-06-25 16:47:22 +04:00
|
|
|
if (err) {
|
|
|
|
unlock_page(page);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2007-10-16 12:25:19 +04:00
|
|
|
kmap(page);
|
2006-06-25 16:47:22 +04:00
|
|
|
base = (char*)page_address(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
|
|
|
memset(base, 0, PAGE_SIZE);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
de = (struct ufs_dir_entry *) base;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
de->d_ino = cpu_to_fs32(sb, inode->i_ino);
|
|
|
|
ufs_set_de_type(sb, de, inode->i_mode);
|
|
|
|
ufs_set_de_namlen(sb, de, 1);
|
|
|
|
de->d_reclen = cpu_to_fs16(sb, UFS_DIR_REC_LEN(1));
|
|
|
|
strcpy (de->d_name, ".");
|
|
|
|
de = (struct ufs_dir_entry *)
|
|
|
|
((char *)de + fs16_to_cpu(sb, de->d_reclen));
|
|
|
|
de->d_ino = cpu_to_fs32(sb, dir->i_ino);
|
|
|
|
ufs_set_de_type(sb, de, dir->i_mode);
|
2007-02-09 01:20:25 +03:00
|
|
|
de->d_reclen = cpu_to_fs16(sb, chunk_size - UFS_DIR_REC_LEN(1));
|
2005-04-17 02:20:36 +04:00
|
|
|
ufs_set_de_namlen(sb, de, 2);
|
|
|
|
strcpy (de->d_name, "..");
|
2007-10-16 12:25:19 +04:00
|
|
|
kunmap(page);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
2007-02-09 01:20:25 +03:00
|
|
|
err = ufs_commit_chunk(page, 0, chunk_size);
|
2006-06-25 16:47:22 +04:00
|
|
|
fail:
|
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(page);
|
2006-06-25 16:47:22 +04:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* routine to check that the specified directory is empty (for rmdir)
|
|
|
|
*/
|
2006-06-25 16:47:22 +04:00
|
|
|
int ufs_empty_dir(struct inode * inode)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2006-06-25 16:47:22 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
struct page *page = NULL;
|
2015-05-24 18:19:43 +03:00
|
|
|
unsigned long i, npages = dir_pages(inode);
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
char *kaddr;
|
|
|
|
struct ufs_dir_entry *de;
|
|
|
|
page = ufs_get_page(inode, i);
|
|
|
|
|
|
|
|
if (IS_ERR(page))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
kaddr = page_address(page);
|
|
|
|
de = (struct ufs_dir_entry *)kaddr;
|
|
|
|
kaddr += ufs_last_byte(inode, i) - UFS_DIR_REC_LEN(1);
|
|
|
|
|
|
|
|
while ((char *)de <= kaddr) {
|
|
|
|
if (de->d_reclen == 0) {
|
2008-04-28 13:16:17 +04:00
|
|
|
ufs_error(inode->i_sb, __func__,
|
2006-06-25 16:47:22 +04:00
|
|
|
"zero-length directory entry: "
|
|
|
|
"kaddr=%p, de=%p\n", kaddr, de);
|
|
|
|
goto not_empty;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
if (de->d_ino) {
|
|
|
|
u16 namelen=ufs_get_de_namlen(sb, de);
|
|
|
|
/* check for . and .. */
|
|
|
|
if (de->d_name[0] != '.')
|
|
|
|
goto not_empty;
|
|
|
|
if (namelen > 2)
|
|
|
|
goto not_empty;
|
|
|
|
if (namelen < 2) {
|
|
|
|
if (inode->i_ino !=
|
|
|
|
fs32_to_cpu(sb, de->d_ino))
|
|
|
|
goto not_empty;
|
|
|
|
} else if (de->d_name[1] != '.')
|
|
|
|
goto not_empty;
|
|
|
|
}
|
|
|
|
de = ufs_next_entry(sb, de);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2006-06-25 16:47:22 +04:00
|
|
|
ufs_put_page(page);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
return 1;
|
2006-06-25 16:47:22 +04:00
|
|
|
|
|
|
|
not_empty:
|
|
|
|
ufs_put_page(page);
|
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2006-03-28 13:56:42 +04:00
|
|
|
const struct file_operations ufs_dir_operations = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.read = generic_read_dir,
|
2016-04-21 06:42:46 +03:00
|
|
|
.iterate_shared = ufs_readdir,
|
2010-05-26 19:53:41 +04:00
|
|
|
.fsync = generic_file_fsync,
|
2008-09-03 23:53:01 +04:00
|
|
|
.llseek = generic_file_llseek,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|