#endif
extern struct vcache *afs_globalVp;
-
-
static ssize_t
afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
{
else {
osi_FlushPages(vcp, credp); /* ensure stale pages are gone */
AFS_GUNLOCK();
+#ifdef DO_SYNC_READ
+ code = do_sync_read(fp, buf, count, offp);
+#else
code = generic_file_read(fp, buf, count, offp);
+#endif
AFS_GLOCK();
}
afs_linux_write(struct file *fp, const char *buf, size_t count, loff_t * offp)
{
ssize_t code = 0;
- int code2 = 0;
struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
struct vrequest treq;
cred_t *credp = crref();
code = -code;
else {
AFS_GUNLOCK();
+#ifdef DO_SYNC_READ
+ code = do_sync_write(fp, buf, count, offp);
+#else
code = generic_file_write(fp, buf, count, offp);
+#endif
AFS_GLOCK();
}
ObtainWriteLock(&vcp->lock, 530);
- vcp->m.Date = osi_Time(); /* set modification time */
afs_FakeClose(vcp, credp);
- if (code >= 0)
- code2 = afs_DoPartialWrite(vcp, &treq);
- if (code2 && code >= 0)
- code = (ssize_t) - code2;
ReleaseWriteLock(&vcp->lock);
afs_Trace4(afs_iclSetp, CM_TRACE_WRITEOP, ICL_TYPE_POINTER, vcp,
code = -ENOENT;
goto out;
}
- ObtainReadLock(&avc->lock);
+ ObtainSharedLock(&avc->lock, 810);
+ UpgradeSToWLock(&avc->lock, 811);
ObtainReadLock(&tdc->lock);
/*
* Make sure that the data in the cache is current. There are two
&& (tdc->dflags & DFFetching)
&& hsame(avc->m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
- ReleaseReadLock(&avc->lock);
+ ReleaseSharedLock(&avc->lock);
afs_osi_Sleep(&tdc->validPos);
- ObtainReadLock(&avc->lock);
+ ObtainSharedLock(&avc->lock, 812);
ObtainReadLock(&tdc->lock);
}
if (!(avc->states & CStatd)
|| !hsame(avc->m.DataVersion, tdc->f.versionNo)) {
ReleaseReadLock(&tdc->lock);
- ReleaseReadLock(&avc->lock);
+ ReleaseSharedLock(&avc->lock);
afs_PutDCache(tdc);
goto tagain;
}
+ /* Set the readdir-in-progress flag, and downgrade the lock
+ * to shared so others will be able to acquire a read lock.
+ */
+ avc->states |= CReadDir;
+ avc->dcreaddir = tdc;
+ avc->readdir_pid = MyPidxx;
+ ConvertWToSLock(&avc->lock);
+
/* Fill in until we get an error or we're done. This implementation
* takes an offset in units of blobs, rather than bytes.
*/
if (!de)
break;
- ino = (avc->fid.Fid.Volume << 16) + ntohl(de->fid.vnode);
- ino &= 0x7fffffff; /* Assumes 32 bit ino_t ..... */
+ ino = afs_calc_inum (avc->fid.Fid.Volume, ntohl(de->fid.vnode));
+
if (de->name)
len = strlen(de->name);
else {
printf("afs_linux_readdir: afs_dir_GetBlob failed, null name (inode %lx, dirpos %d)\n",
(unsigned long)&tdc->f.inode, dirpos);
DRelease((struct buffer *) de, 0);
+ ReleaseSharedLock(&avc->lock);
afs_PutDCache(tdc);
- ReleaseReadLock(&avc->lock);
code = -ENOENT;
goto out;
}
/* clean up from afs_FindVCache */
afs_PutVCache(tvc);
}
+ /*
+ * If this is NFS readdirplus, then the filler is going to
+ * call getattr on this inode, which will deadlock if we're
+ * holding the GLOCK.
+ */
+ AFS_GUNLOCK();
code = (*filldir) (dirbuf, de->name, len, offset, ino, type);
+ AFS_GLOCK();
}
#else
code = (*filldir) (dirbuf, de->name, len, offset, ino);
ReleaseReadLock(&tdc->lock);
afs_PutDCache(tdc);
- ReleaseReadLock(&avc->lock);
+ UpgradeSToWLock(&avc->lock, 813);
+ avc->states &= ~CReadDir;
+ avc->dcreaddir = 0;
+ avc->readdir_pid = 0;
+ ReleaseSharedLock(&avc->lock);
code = 0;
out:
code = afs_lockctl(vcp, &flock, cmd, credp);
AFS_GUNLOCK();
+#ifdef AFS_LINUX24_ENV
+ if ((code == 0 || flp->fl_type == F_UNLCK) &&
+ (cmd == F_SETLK || cmd == F_SETLKW)) {
+#ifdef POSIX_LOCK_FILE_WAIT_ARG
+ code = posix_lock_file(fp, flp, 0);
+#else
+ flp->fl_flags &=~ FL_SLEEP;
+ code = posix_lock_file(fp, flp);
+#endif
+ if (code && flp->fl_type != F_UNLCK) {
+ struct AFS_FLOCK flock2;
+ flock2 = flock;
+ flock2.l_type = F_UNLCK;
+ AFS_GLOCK();
+ afs_lockctl(vcp, &flock2, F_SETLK, credp);
+ AFS_GUNLOCK();
+ }
+ }
+#endif
/* Convert flock back to Linux's file_lock */
flp->fl_type = flock.l_type;
flp->fl_pid = flock.l_pid;
}
+#ifdef STRUCT_FILE_OPERATIONS_HAS_FLOCK
+static int
+afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) {
+ int code = 0;
+ struct vcache *vcp = VTOAFS(FILE_INODE(fp));
+ cred_t *credp = crref();
+ struct AFS_FLOCK flock;
+ /* Convert to a lock format afs_lockctl understands. */
+ memset((char *)&flock, 0, sizeof(flock));
+ flock.l_type = flp->fl_type;
+ flock.l_pid = flp->fl_pid;
+ flock.l_whence = 0;
+ flock.l_start = 0;
+ flock.l_len = OFFSET_MAX;
+
+ /* Safe because there are no large files, yet */
+#if defined(F_GETLK64) && (F_GETLK != F_GETLK64)
+ if (cmd == F_GETLK64)
+ cmd = F_GETLK;
+ else if (cmd == F_SETLK64)
+ cmd = F_SETLK;
+ else if (cmd == F_SETLKW64)
+ cmd = F_SETLKW;
+#endif /* F_GETLK64 && F_GETLK != F_GETLK64 */
+
+ AFS_GLOCK();
+ code = afs_lockctl(vcp, &flock, cmd, credp);
+ AFS_GUNLOCK();
+
+ if ((code == 0 || flp->fl_type == F_UNLCK) &&
+ (cmd == F_SETLK || cmd == F_SETLKW)) {
+ flp->fl_flags &=~ FL_SLEEP;
+ code = flock_lock_file_wait(fp, flp);
+ if (code && flp->fl_type != F_UNLCK) {
+ struct AFS_FLOCK flock2;
+ flock2 = flock;
+ flock2.l_type = F_UNLCK;
+ AFS_GLOCK();
+ afs_lockctl(vcp, &flock2, F_SETLK, credp);
+ AFS_GUNLOCK();
+ }
+ }
+ /* Convert flock back to Linux's file_lock */
+ flp->fl_type = flock.l_type;
+ flp->fl_pid = flock.l_pid;
+
+ crfree(credp);
+ return -code;
+}
+#endif
+
/* afs_linux_flush
* essentially the same as afs_fsync() but we need to get the return
* code for the sys_close() here, not afs_linux_release(), so call
* afs_StoreAllSegments() with AFS_LASTSTORE
*/
static int
+#if defined(FOP_FLUSH_TAKES_FL_OWNER_T)
+afs_linux_flush(struct file *fp, fl_owner_t id)
+#else
afs_linux_flush(struct file *fp)
+#endif
{
struct vrequest treq;
struct vcache *vcp = VTOAFS(FILE_INODE(fp));
struct file_operations afs_file_fops = {
.read = afs_linux_read,
.write = afs_linux_write,
+#ifdef GENERIC_FILE_AIO_READ
+ .aio_read = generic_file_aio_read,
+ .aio_write = generic_file_aio_write,
+#endif
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = afs_unlocked_xioctl,
#else
.release = afs_linux_release,
.fsync = afs_linux_fsync,
.lock = afs_linux_lock,
+#ifdef STRUCT_FILE_OPERATIONS_HAS_FLOCK
+ .flock = afs_linux_flock,
+#endif
};
#endif
AFS_GLOCK();
+#ifdef notyet
/* Make this a fast path (no crref), since it's called so often. */
if (vcp->states & CStatd) {
#endif
return 0;
}
+#endif
credp = crref();
code = afs_getattr(vcp, &vattr, credp);
struct vcache *vcp = VTOAFS(ip);
AFS_GLOCK();
- if (vcp->states & CUnlinked)
- (void) afs_remunlink(vcp, 1); /* perhaps afs_InactiveVCache() instead */
+ (void) afs_InactiveVCache(vcp, NULL);
AFS_GUNLOCK();
iput(ip);
afs_linux_lookup(struct inode *dip, struct dentry *dp)
#endif
{
- struct vattr vattr;
cred_t *credp = crref();
struct vcache *vcp = NULL;
const char *comp = dp->d_name.name;
- struct dentry *res = NULL;
struct inode *ip = NULL;
+#if defined(AFS_LINUX26_ENV)
+ struct dentry *newdp = NULL;
+#endif
int code;
#if defined(AFS_LINUX26_ENV)
code = afs_lookup(VTOAFS(dip), comp, &vcp, credp);
if (vcp) {
- ip = AFSTOV(vcp);
+ struct vattr vattr;
+ ip = AFSTOV(vcp);
afs_getattr(vcp, &vattr, credp);
afs_fill_inode(ip, &vattr);
}
dp->d_op = &afs_dentry_operations;
dp->d_time = hgetlo(VTOAFS(dip)->m.DataVersion);
AFS_GUNLOCK();
+
#if defined(AFS_LINUX24_ENV)
if (ip && S_ISDIR(ip->i_mode)) {
- d_prune_aliases(ip);
- res = d_find_alias(ip);
+ struct dentry *alias;
+
+ /* Try to invalidate an existing alias in favor of our new one */
+ alias = d_find_alias(ip);
+#if defined(AFS_LINUX26_ENV)
+ /* But not if it's disconnected; then we want d_splice_alias below */
+ if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) {
+#else
+ if (alias) {
+#endif
+ if (d_invalidate(alias) == 0) {
+ dput(alias);
+ } else {
+ iput(ip);
+#if defined(AFS_LINUX26_ENV)
+ unlock_kernel();
+#endif
+ crfree(credp);
+ return alias;
+ }
+ }
}
- if (res) {
- if (d_unhashed(res))
- d_rehash(res);
- iput(ip);
- } else
#endif
+#if defined(AFS_LINUX26_ENV)
+ newdp = d_splice_alias(ip, dp);
+#else
d_add(dp, ip);
+#endif
#if defined(AFS_LINUX26_ENV)
unlock_kernel();
/* It's ok for the file to not be found. That's noted by the caller by
* seeing that the dp->d_inode field is NULL.
*/
-#if defined(AFS_LINUX24_ENV)
- if (code == 0)
- return res;
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10)
+#if defined(AFS_LINUX26_ENV)
+ if (!code || code == ENOENT)
+ return newdp;
+#else
if (code == ENOENT)
return ERR_PTR(0);
+#endif
else
return ERR_PTR(-code);
#else
#if defined(AFS_LINUX26_ENV)
lock_kernel();
#endif
- if (((VREFCOUNT(tvc) > 0) && tvc->opens > 0)
+ if (VREFCOUNT(tvc) > 1 && tvc->opens > 0
&& !(tvc->states & CUnlinked)) {
struct dentry *__dp;
char *__name;
}
tvc->uncred = credp;
tvc->states |= CUnlinked;
+ } else {
+ osi_FreeSmallSpace(__name);
}
AFS_GUNLOCK();
cred_t *credp = crref();
const char *name = dp->d_name.name;
-#if defined(AFS_LINUX26_ENV)
- lock_kernel();
-#endif
+ /* locking kernel conflicts with glock? */
+
AFS_GLOCK();
code = afs_rmdir(VTOAFS(dip), name, credp);
AFS_GUNLOCK();
d_drop(dp);
}
-#if defined(AFS_LINUX26_ENV)
- unlock_kernel();
-#endif
crfree(credp);
return -code;
}
return -code;
}
-#if !defined(AFS_LINUX24_ENV)
+#if !defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
/* afs_linux_readlink
* Fill target (which is in user space) with contents of symlink.
*/
/* afs_linux_follow_link
* a file system dependent link following routine.
*/
+#if defined(AFS_LINUX24_ENV)
+static int afs_linux_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+ int code;
+ char *name;
+
+ name = osi_Alloc(PATH_MAX);
+ if (!name) {
+ return -EIO;
+ }
+
+ AFS_GLOCK();
+ code = afs_linux_ireadlink(dentry->d_inode, name, PATH_MAX - 1, AFS_UIOSYS);
+ AFS_GUNLOCK();
+
+ if (code < 0) {
+ goto out;
+ }
+
+ name[code] = '\0';
+ code = vfs_follow_link(nd, name);
+
+out:
+ osi_Free(name, PATH_MAX);
+
+ return code;
+}
+
+#else /* !defined(AFS_LINUX24_ENV) */
+
static struct dentry *
afs_linux_follow_link(struct dentry *dp, struct dentry *basep,
unsigned int follow)
AFS_GUNLOCK();
return res;
}
-#endif
+#endif /* AFS_LINUX24_ENV */
+#endif /* USABLE_KERNEL_PAGE_SYMLINK_CACHE */
/* afs_linux_readpage
* all reads come through here. A strategy-like read call.
clear_bit(PG_error, &pp->flags);
#endif
- setup_uio(&tuio, &iovec, (char *)address, offset, PAGESIZE, UIO_READ,
+ setup_uio(&tuio, &iovec, (char *)address, offset, PAGE_SIZE, UIO_READ,
AFS_UIOSYS);
#ifdef AFS_LINUX24_ENV
lock_kernel();
if (!code) {
if (tuio.uio_resid) /* zero remainder of page */
- memset((void *)(address + (PAGESIZE - tuio.uio_resid)), 0,
+ memset((void *)(address + (PAGE_SIZE - tuio.uio_resid)), 0,
tuio.uio_resid);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
flush_dcache_page(pp);
ip->i_size = vcp->m.Length;
ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
+ if (!code) {
+ struct vrequest treq;
+
+ ObtainWriteLock(&vcp->lock, 533);
+ if (!afs_InitReq(&treq, credp))
+ code = afs_DoPartialWrite(vcp, &treq);
+ ReleaseWriteLock(&vcp->lock);
+ }
code = code ? -code : count - tuio.uio_resid;
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
#if defined(AFS_LINUX26_ENV)
if (PageReclaim(pp)) {
+# if defined(WRITEPAGE_ACTIVATE)
return WRITEPAGE_ACTIVATE;
+# else
+ return AOP_WRITEPAGE_ACTIVATE;
+# endif
}
#else
if (PageLaunder(pp)) {
ip->i_size = vcp->m.Length;
ip->i_blocks = ((vcp->m.Length + 1023) >> 10) << 1;
+ if (!code) {
+ struct vrequest treq;
+
+ ObtainWriteLock(&vcp->lock, 533);
+ vcp->m.Date = osi_Time(); /* set modification time */
+ if (!afs_InitReq(&treq, credp))
+ code = afs_DoPartialWrite(vcp, &treq);
+ ReleaseWriteLock(&vcp->lock);
+ }
+
code = code ? -code : count - tuio.uio_resid;
afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp,
ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp),
/* We really need a separate symlink set of ops, since do_follow_link()
* determines if it _is_ a link by checking if the follow_link op is set.
*/
-#if defined(AFS_LINUX24_ENV)
+#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
static int
afs_symlink_filler(struct file *file, struct page *page)
{
static struct address_space_operations afs_symlink_aops = {
.readpage = afs_symlink_filler
};
-#endif
+#endif /* USABLE_KERNEL_PAGE_SYMLINK_CACHE */
static struct inode_operations afs_symlink_iops = {
-#if defined(AFS_LINUX24_ENV)
+#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
.readlink = page_readlink,
#if defined(HAVE_KERNEL_PAGE_FOLLOW_LINK)
.follow_link = page_follow_link,
.follow_link = page_follow_link_light,
.put_link = page_put_link,
#endif
- .setattr = afs_notify_change,
-#else
+#else /* !defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE) */
.readlink = afs_linux_readlink,
.follow_link = afs_linux_follow_link,
+#if !defined(AFS_LINUX24_ENV)
.permission = afs_linux_permission,
.revalidate = afs_linux_revalidate,
#endif
+#endif /* USABLE_KERNEL_PAGE_SYMLINK_CACHE */
+#if defined(AFS_LINUX24_ENV)
+ .setattr = afs_notify_change,
+#endif
};
void
} else if (S_ISLNK(ip->i_mode)) {
ip->i_op = &afs_symlink_iops;
-#if defined(AFS_LINUX24_ENV)
+#if defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE)
ip->i_data.a_ops = &afs_symlink_aops;
ip->i_mapping = &ip->i_data;
#endif
git://git.openafs.org / openafs.git / blobdiff