mirror of
https://git.openafs.org/openafs.git
synced 2025-01-31 05:27:44 +00:00
LINUX: Sometimes let dentry_open handle refcounts
When Linux changed dentry_open to use a 'path' argument, they also changed it so dentry_open handles incrementing the relevant ref counts. So now, sometimes we need to inc the dentry and vfsmount refcounts ourselves, and sometimes we need to leave them alone. To accommodate this, change afs_dentry_open to also handle refcounting itself, and 'get' the given dentry and vfsmount if necessary. Also note that currently, afs_linux_raw_open can call afs_dentry_open twice in the case of an error, but it does not dget(dp). This means that dp could be undercounted, since dentry_open on older kernels will dec the refcount on the given dentry in the case of an error. This change should also fix this so dp is not undercounted in that case. FIXES 131613 Reviewed-on: http://gerrit.openafs.org/9801 Reviewed-by: Derrick Brashear <shadow@your-file-system.com> Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com> Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> (cherry picked from commit e31240732cbe449fedea5095037ac08d1d513fa9) Change-Id: I082063d324d99c3d02ed372a1c20462f13bb4a26 Reviewed-on: http://gerrit.openafs.org/9803 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com> Reviewed-by: Derrick Brashear <shadow@your-file-system.com> Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com> Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
parent
d572281d5d
commit
d99de7f2e8
@ -473,10 +473,11 @@ afs_dentry_open(struct dentry *dp, struct vfsmount *mnt, int flags, const struct
|
||||
struct file *filp;
|
||||
path.mnt = mnt;
|
||||
path.dentry = dp;
|
||||
/* note that dentry_open will path_get for us */
|
||||
filp = dentry_open(&path, flags, creds);
|
||||
return filp;
|
||||
#else
|
||||
return dentry_open(dp, mnt, flags, creds);
|
||||
return dentry_open(dget(dp), mntget(mnt), flags, creds);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
@ -56,14 +56,17 @@ afs_linux_raw_open(afs_dcache_id_t *ainode)
|
||||
|
||||
#if defined(STRUCT_TASK_STRUCT_HAS_CRED)
|
||||
/* Use stashed credentials - prevent selinux/apparmor problems */
|
||||
filp = afs_dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, cache_creds);
|
||||
filp = afs_dentry_open(dp, afs_cacheMnt, O_RDWR, cache_creds);
|
||||
if (IS_ERR(filp))
|
||||
filp = afs_dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, current_cred());
|
||||
filp = afs_dentry_open(dp, afs_cacheMnt, O_RDWR, current_cred());
|
||||
#else
|
||||
filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR);
|
||||
filp = dentry_open(dget(dp), mntget(afs_cacheMnt), O_RDWR);
|
||||
#endif
|
||||
if (IS_ERR(filp))
|
||||
osi_Panic("Can't open file: %d\n", (int) PTR_ERR(filp));
|
||||
|
||||
dput(dp);
|
||||
|
||||
return filp;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user