* [PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [9/10] [3/4]
@ 2004-08-23 17:15 O.Sezer
2004-08-25 11:08 ` Marcelo Tosatti
0 siblings, 1 reply; 3+ messages in thread
From: O.Sezer @ 2004-08-23 17:15 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo.tosatti
[-- Attachment #1: Type: text/plain, Size: 82 bytes --]
splitted-up the fs/* gcc3.4-inline-patches.
[3/4] intermezzo, while we're here
[-- Attachment #2: gcc34_inline_09-3.diff --]
[-- Type: text/plain, Size: 2726 bytes --]
--- 28p1/fs/intermezzo/file.c~ 2004-02-18 15:36:31.000000000 +0200
+++ 28p1/fs/intermezzo/file.c 2004-08-07 14:09:39.000000000 +0300
@@ -78,16 +78,19 @@
pathlen = MYPATHLEN(buffer, path);
CDEBUG(D_FILE, "de %p, dd %p\n", de, dd);
+
if (dd->remote_ino == 0) {
rc = presto_get_fileid(minor, fset, de);
+ if (dd->remote_ino == 0)
+ CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc,
+ dd->remote_ino);
+
}
memset (&info, 0, sizeof(info));
if (dd->remote_ino > 0) {
info.remote_ino = dd->remote_ino;
info.remote_generation = dd->remote_generation;
- } else
- CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc,
- dd->remote_ino);
+ }
rc = izo_upc_open(minor, pathlen, path, fset->fset_name, &info);
PRESTO_FREE(buffer, PAGE_SIZE);
=== http://marc.theaimsgroup.com/?l=bk-commits-head&m=105399886001079&w=2
--- 28p1/fs/intermezzo/methods.c~ 2002-11-29 01:53:15.000000000 +0200
+++ 28p1/fs/intermezzo/methods.c 2004-08-17 05:02:58.000000000 +0300
@@ -254,8 +254,8 @@
if (ops == NULL) {
CERROR("prepare to die: unrecognized cache type for Filter\n");
}
- return ops;
FEXIT;
+ return ops;
}
--- 28p1/fs/intermezzo/journal_xfs.c~ 2002-11-29 01:53:15.000000000 +0200
+++ 28p1/fs/intermezzo/journal_xfs.c 2004-08-17 05:02:58.000000000 +0300
@@ -58,7 +57,7 @@
VFS_STATVFS(vfsp, &stat, NULL, rc);
avail = statp.f_bfree;
- return sbp->sb_fdblocks;;
+ return sbp->sb_fdblocks;
#endif
return 0x0fffffff;
}
--- 28p1/fs/intermezzo/psdev.c~ 2002-11-29 01:53:15.000000000 +0200
+++ 28p1/fs/intermezzo/psdev.c 2004-08-17 15:18:34.000000000 +0300
@@ -564,6 +564,10 @@
buffer->u_uniq = req->rq_unique;
buffer->u_async = async;
+ /* Remove potential datarace possibility*/
+ if ( async )
+ req->rq_flags = REQ_ASYNC;
+
spin_lock(&channel->uc_lock);
/* Append msg to pending queue and poke Lento. */
list_add(&req->rq_chain, channel->uc_pending.prev);
@@ -576,7 +580,7 @@
if ( async ) {
/* req, rq_data are freed in presto_psdev_read for async */
- req->rq_flags = REQ_ASYNC;
+ /* req->rq_flags = REQ_ASYNC;*/
EXIT;
return 0;
}
@@ -647,5 +651,6 @@
exit_req:
PRESTO_FREE(req, sizeof(struct upc_req));
exit_buf:
+ PRESTO_FREE(buffer,*size);
return error;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [9/10] [3/4]
2004-08-23 17:15 O.Sezer
@ 2004-08-25 11:08 ` Marcelo Tosatti
0 siblings, 0 replies; 3+ messages in thread
From: Marcelo Tosatti @ 2004-08-25 11:08 UTC (permalink / raw)
To: O.Sezer; +Cc: linux-kernel
On Mon, Aug 23, 2004 at 08:15:28PM +0300, O.Sezer wrote:
> splitted-up the fs/* gcc3.4-inline-patches.
>
> [3/4] intermezzo, while we're here
>
>
Ozkan,
What is this about?
I can't understand this as trivial gcc3.4 inline fixes.
> --- 28p1/fs/intermezzo/file.c~ 2004-02-18 15:36:31.000000000 +0200
> +++ 28p1/fs/intermezzo/file.c 2004-08-07 14:09:39.000000000 +0300
> @@ -78,16 +78,19 @@
> pathlen = MYPATHLEN(buffer, path);
>
> CDEBUG(D_FILE, "de %p, dd %p\n", de, dd);
> +
> if (dd->remote_ino == 0) {
> rc = presto_get_fileid(minor, fset, de);
> + if (dd->remote_ino == 0)
> + CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc,
> + dd->remote_ino);
> +
> }
> memset (&info, 0, sizeof(info));
> if (dd->remote_ino > 0) {
> info.remote_ino = dd->remote_ino;
> info.remote_generation = dd->remote_generation;
> - } else
> - CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc,
> - dd->remote_ino);
> + }
>
> rc = izo_upc_open(minor, pathlen, path, fset->fset_name, &info);
> PRESTO_FREE(buffer, PAGE_SIZE);
> === http://marc.theaimsgroup.com/?l=bk-commits-head&m=105399886001079&w=2
> --- 28p1/fs/intermezzo/methods.c~ 2002-11-29 01:53:15.000000000 +0200
> +++ 28p1/fs/intermezzo/methods.c 2004-08-17 05:02:58.000000000 +0300
> @@ -254,8 +254,8 @@
> if (ops == NULL) {
> CERROR("prepare to die: unrecognized cache type for Filter\n");
> }
> - return ops;
> FEXIT;
> + return ops;
> }
>
>
> --- 28p1/fs/intermezzo/journal_xfs.c~ 2002-11-29 01:53:15.000000000 +0200
> +++ 28p1/fs/intermezzo/journal_xfs.c 2004-08-17 05:02:58.000000000 +0300
> @@ -58,7 +57,7 @@
> VFS_STATVFS(vfsp, &stat, NULL, rc);
> avail = statp.f_bfree;
>
> - return sbp->sb_fdblocks;;
> + return sbp->sb_fdblocks;
> #endif
> return 0x0fffffff;
> }
> --- 28p1/fs/intermezzo/psdev.c~ 2002-11-29 01:53:15.000000000 +0200
> +++ 28p1/fs/intermezzo/psdev.c 2004-08-17 15:18:34.000000000 +0300
> @@ -564,6 +564,10 @@
> buffer->u_uniq = req->rq_unique;
> buffer->u_async = async;
>
> + /* Remove potential datarace possibility*/
> + if ( async )
> + req->rq_flags = REQ_ASYNC;
> +
> spin_lock(&channel->uc_lock);
> /* Append msg to pending queue and poke Lento. */
> list_add(&req->rq_chain, channel->uc_pending.prev);
> @@ -576,7 +580,7 @@
>
> if ( async ) {
> /* req, rq_data are freed in presto_psdev_read for async */
> - req->rq_flags = REQ_ASYNC;
> + /* req->rq_flags = REQ_ASYNC;*/
> EXIT;
> return 0;
> }
> @@ -647,5 +651,6 @@
> exit_req:
> PRESTO_FREE(req, sizeof(struct upc_req));
> exit_buf:
> + PRESTO_FREE(buffer,*size);
> return error;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [9/10] [3/4]
@ 2004-08-25 23:09 O.Sezer
0 siblings, 0 replies; 3+ messages in thread
From: O.Sezer @ 2004-08-25 23:09 UTC (permalink / raw)
To: linux-kernel
Marcelo:
Initially some non-inline/non-gcc34 related backports
sneaked in the original patch and this was why I splitted
the patch up.
These hunk are, as they're labelled, fixes from 2.6 while
we are working on the intermezzo directory: While hunting
for the many changes for the intermezzo inline fixes in
the other trees, I also caught these ones and thought that
you may be interested in them.
Feel free to apply or dump them.
Ozkan
On Mon, Aug 23, 2004 at 08:15:28PM +0300, O.Sezer wrote:
> splitted-up the fs/* gcc3.4-inline-patches.
>
> [3/4] intermezzo, while we're here
>
>
Ozkan,
What is this about?
I can't understand this as trivial gcc3.4 inline fixes.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-08-25 23:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-25 23:09 [PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [9/10] [3/4] O.Sezer
-- strict thread matches above, loose matches on Subject: below --
2004-08-23 17:15 O.Sezer
2004-08-25 11:08 ` Marcelo Tosatti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox