Merge branch 'thinkpad-2.6.32-part2' into release

[karo-tx-linux.git] / fs / qnx4 / namei.c

diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c
index 5972ed21493725d762995d8d8110c8abb0b1529c..ae1e7edbacd671d14b4e4e5ffa46cdc6078e7719 100644 (file)
--- a/fs/qnx4/namei.c
+++ b/fs/qnx4/namei.c
@@ -134,108 +134,3 @@ out:
 
        return NULL;
 }
-
-#ifdef CONFIG_QNX4FS_RW
-int qnx4_create(struct inode *dir, struct dentry *dentry, int mode,
-               struct nameidata *nd)
-{
-       QNX4DEBUG(("qnx4: qnx4_create\n"));
-       if (dir == NULL) {
-               return -ENOENT;
-       }
-       return -ENOSPC;
-}
-
-int qnx4_rmdir(struct inode *dir, struct dentry *dentry)
-{
-       struct buffer_head *bh;
-       struct qnx4_inode_entry *de;
-       struct inode *inode;
-       int retval;
-       int ino;
-
-       QNX4DEBUG(("qnx4: qnx4_rmdir [%s]\n", dentry->d_name.name));
-       lock_kernel();
-       bh = qnx4_find_entry(dentry->d_name.len, dir, dentry->d_name.name,
-                            &de, &ino);
-       if (bh == NULL) {
-               unlock_kernel();
-               return -ENOENT;
-       }
-       inode = dentry->d_inode;
-       if (inode->i_ino != ino) {
-               retval = -EIO;
-               goto end_rmdir;
-       }
-#if 0
-       if (!empty_dir(inode)) {
-               retval = -ENOTEMPTY;
-               goto end_rmdir;
-       }
-#endif
-       if (inode->i_nlink != 2) {
-               QNX4DEBUG(("empty directory has nlink!=2 (%d)\n", inode->i_nlink));
-       }
-       QNX4DEBUG(("qnx4: deleting directory\n"));
-       de->di_status = 0;
-       memset(de->di_fname, 0, sizeof de->di_fname);
-       de->di_mode = 0;
-       mark_buffer_dirty_inode(bh, dir);
-       clear_nlink(inode);
-       mark_inode_dirty(inode);
-       inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
-       inode_dec_link_count(dir);
-       retval = 0;
-
-      end_rmdir:
-       brelse(bh);
-
-       unlock_kernel();
-       return retval;
-}
-
-int qnx4_unlink(struct inode *dir, struct dentry *dentry)
-{
-       struct buffer_head *bh;
-       struct qnx4_inode_entry *de;
-       struct inode *inode;
-       int retval;
-       int ino;
-
-       QNX4DEBUG(("qnx4: qnx4_unlink [%s]\n", dentry->d_name.name));
-       lock_kernel();
-       bh = qnx4_find_entry(dentry->d_name.len, dir, dentry->d_name.name,
-                            &de, &ino);
-       if (bh == NULL) {
-               unlock_kernel();
-               return -ENOENT;
-       }
-       inode = dentry->d_inode;
-       if (inode->i_ino != ino) {
-               retval = -EIO;
-               goto end_unlink;
-       }
-       retval = -EPERM;
-       if (!inode->i_nlink) {
-               QNX4DEBUG(("Deleting nonexistent file (%s:%lu), %d\n",
-                          inode->i_sb->s_id,
-                          inode->i_ino, inode->i_nlink));
-               inode->i_nlink = 1;
-       }
-       de->di_status = 0;
-       memset(de->di_fname, 0, sizeof de->di_fname);
-       de->di_mode = 0;
-       mark_buffer_dirty_inode(bh, dir);
-       dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
-       mark_inode_dirty(dir);
-       inode->i_ctime = dir->i_ctime;
-       inode_dec_link_count(inode);
-       retval = 0;
-
-end_unlink:
-       unlock_kernel();
-       brelse(bh);
-
-       return retval;
-}
-#endif