summaryrefslogtreecommitdiffstats
path: root/kernel/fs/sysv
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/sysv')
-rw-r--r--kernel/fs/sysv/Makefile2
-rw-r--r--kernel/fs/sysv/dir.c5
-rw-r--r--kernel/fs/sysv/inode.c10
-rw-r--r--kernel/fs/sysv/symlink.c20
-rw-r--r--kernel/fs/sysv/sysv.h3
5 files changed, 4 insertions, 36 deletions
diff --git a/kernel/fs/sysv/Makefile b/kernel/fs/sysv/Makefile
index 3591f9d7a..7a75e70a4 100644
--- a/kernel/fs/sysv/Makefile
+++ b/kernel/fs/sysv/Makefile
@@ -5,4 +5,4 @@
obj-$(CONFIG_SYSV_FS) += sysv.o
sysv-objs := ialloc.o balloc.o inode.o itree.o file.o dir.o \
- namei.o super.o symlink.o
+ namei.o super.o
diff --git a/kernel/fs/sysv/dir.c b/kernel/fs/sysv/dir.c
index 8f3555f00..63c1bcb22 100644
--- a/kernel/fs/sysv/dir.c
+++ b/kernel/fs/sysv/dir.c
@@ -33,11 +33,6 @@ static inline void dir_put_page(struct page *page)
page_cache_release(page);
}
-static inline unsigned long dir_pages(struct inode *inode)
-{
- return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
-}
-
static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)
{
struct address_space *mapping = page->mapping;
diff --git a/kernel/fs/sysv/inode.c b/kernel/fs/sysv/inode.c
index 88956309c..02fa1dcc5 100644
--- a/kernel/fs/sysv/inode.c
+++ b/kernel/fs/sysv/inode.c
@@ -162,14 +162,8 @@ void sysv_set_inode(struct inode *inode, dev_t rdev)
inode->i_fop = &sysv_dir_operations;
inode->i_mapping->a_ops = &sysv_aops;
} else if (S_ISLNK(inode->i_mode)) {
- if (inode->i_blocks) {
- inode->i_op = &sysv_symlink_inode_operations;
- inode->i_mapping->a_ops = &sysv_aops;
- } else {
- inode->i_op = &sysv_fast_symlink_inode_operations;
- nd_terminate_link(SYSV_I(inode)->i_data, inode->i_size,
- sizeof(SYSV_I(inode)->i_data) - 1);
- }
+ inode->i_op = &sysv_symlink_inode_operations;
+ inode->i_mapping->a_ops = &sysv_aops;
} else
init_special_inode(inode, inode->i_mode, rdev);
}
diff --git a/kernel/fs/sysv/symlink.c b/kernel/fs/sysv/symlink.c
deleted file mode 100644
index d3fa0d703..000000000
--- a/kernel/fs/sysv/symlink.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * linux/fs/sysv/symlink.c
- *
- * Handling of System V filesystem fast symlinks extensions.
- * Aug 2001, Christoph Hellwig (hch@infradead.org)
- */
-
-#include "sysv.h"
-#include <linux/namei.h>
-
-static void *sysv_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
- nd_set_link(nd, (char *)SYSV_I(d_inode(dentry))->i_data);
- return NULL;
-}
-
-const struct inode_operations sysv_fast_symlink_inode_operations = {
- .readlink = generic_readlink,
- .follow_link = sysv_follow_link,
-};
diff --git a/kernel/fs/sysv/sysv.h b/kernel/fs/sysv/sysv.h
index 69d488986..6c212288a 100644
--- a/kernel/fs/sysv/sysv.h
+++ b/kernel/fs/sysv/sysv.h
@@ -73,7 +73,7 @@ struct sysv_inode_info {
static inline struct sysv_inode_info *SYSV_I(struct inode *inode)
{
- return list_entry(inode, struct sysv_inode_info, vfs_inode);
+ return container_of(inode, struct sysv_inode_info, vfs_inode);
}
static inline struct sysv_sb_info *SYSV_SB(struct super_block *sb)
@@ -161,7 +161,6 @@ extern ino_t sysv_inode_by_name(struct dentry *);
extern const struct inode_operations sysv_file_inode_operations;
extern const struct inode_operations sysv_dir_inode_operations;
-extern const struct inode_operations sysv_fast_symlink_inode_operations;
extern const struct file_operations sysv_file_operations;
extern const struct file_operations sysv_dir_operations;
extern const struct address_space_operations sysv_aops;