← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to fs/anon_inodes.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/anon_inodes.c
48
48
        .get_sb         = anon_inodefs_get_sb,
49
49
        .kill_sb        = kill_anon_super,
50
50
};
51
 
static struct dentry_operations anon_inodefs_dentry_operations = {
 
51
static const struct dentry_operations anon_inodefs_dentry_operations = {
52
52
        .d_delete       = anon_inodefs_delete_dentry,
53
53
};
54
54
 
79
79
        if (IS_ERR(anon_inode_inode))
80
80
                return -ENODEV;
81
81
 
 
82
        if (fops->owner && !try_module_get(fops->owner))
 
83
                return -ENOENT;
 
84
 
82
85
        error = get_unused_fd_flags(flags);
83
86
        if (error < 0)
84
 
                return error;
 
87
                goto err_module;
85
88
        fd = error;
86
89
 
87
90
        /*
128
131
        dput(dentry);
129
132
err_put_unused_fd:
130
133
        put_unused_fd(fd);
 
134
err_module:
 
135
        module_put(fops->owner);
131
136
        return error;
132
137
}
133
138
EXPORT_SYMBOL_GPL(anon_inode_getfd);
154
159
         */
155
160
        inode->i_state = I_DIRTY;
156
161
        inode->i_mode = S_IRUSR | S_IWUSR;
157
 
        inode->i_uid = current->fsuid;
158
 
        inode->i_gid = current->fsgid;
 
162
        inode->i_uid = current_fsuid();
 
163
        inode->i_gid = current_fsgid();
159
164
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
160
165
        return inode;
161
166
}